Skip to content

A local-first personal finance app

♻️ rename report/rollover budget to tracking/envelope (#3483)

Matiss Janis Aboltins55df377a2005
diff --git a/.eslintrc.js b/.eslintrc.js
index 5c3aa52418..324dcdf70e 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -526,8 +526,8 @@ module.exports = {
'./packages/desktop-client/src/components/budget/DynamicBudgetTable.tsx',
'./packages/desktop-client/src/components/budget/index.tsx',
'./packages/desktop-client/src/components/budget/MobileBudget.tsx',
- './packages/desktop-client/src/components/budget/rollover/HoldMenu.tsx',
- './packages/desktop-client/src/components/budget/rollover/TransferMenu.tsx',
+ './packages/desktop-client/src/components/budget/envelope/HoldMenu.tsx',
+ './packages/desktop-client/src/components/budget/envelope/TransferMenu.tsx',
'./packages/desktop-client/src/components/common/Menu.tsx',
'./packages/desktop-client/src/components/FinancesApp.tsx',
'./packages/desktop-client/src/components/GlobalKeys.ts',
diff --git a/packages/desktop-client/src/components/Modals.tsx b/packages/desktop-client/src/components/Modals.tsx
index 7af9f343a2..19ca95755e 100644
--- a/packages/desktop-client/src/components/Modals.tsx
+++ b/packages/desktop-client/src/components/Modals.tsx
@@ -29,6 +29,11 @@ import { CreateEncryptionKeyModal } from './modals/CreateEncryptionKeyModal';
import { CreateLocalAccountModal } from './modals/CreateLocalAccountModal';
import { EditFieldModal } from './modals/EditFieldModal';
import { EditRuleModal } from './modals/EditRuleModal';
+import { EnvelopeBalanceMenuModal } from './modals/EnvelopeBalanceMenuModal';
+import { EnvelopeBudgetMenuModal } from './modals/EnvelopeBudgetMenuModal';
+import { EnvelopeBudgetMonthMenuModal } from './modals/EnvelopeBudgetMonthMenuModal';
+import { EnvelopeBudgetSummaryModal } from './modals/EnvelopeBudgetSummaryModal';
+import { EnvelopeToBudgetMenuModal } from './modals/EnvelopeToBudgetMenuModal';
import { FixEncryptionKeyModal } from './modals/FixEncryptionKeyModal';
import { GoCardlessExternalMsgModal } from './modals/GoCardlessExternalMsgModal';
import { GoCardlessInitialiseModal } from './modals/GoCardlessInitialiseModal';
@@ -45,19 +50,14 @@ import { ManageRulesModal } from './modals/ManageRulesModal';
import { MergeUnusedPayeesModal } from './modals/MergeUnusedPayeesModal';
import { NotesModal } from './modals/NotesModal';
import { PayeeAutocompleteModal } from './modals/PayeeAutocompleteModal';
-import { ReportBalanceMenuModal } from './modals/ReportBalanceMenuModal';
-import { ReportBudgetMenuModal } from './modals/ReportBudgetMenuModal';
-import { ReportBudgetMonthMenuModal } from './modals/ReportBudgetMonthMenuModal';
-import { ReportBudgetSummaryModal } from './modals/ReportBudgetSummaryModal';
-import { RolloverBalanceMenuModal } from './modals/RolloverBalanceMenuModal';
-import { RolloverBudgetMenuModal } from './modals/RolloverBudgetMenuModal';
-import { RolloverBudgetMonthMenuModal } from './modals/RolloverBudgetMonthMenuModal';
-import { RolloverBudgetSummaryModal } from './modals/RolloverBudgetSummaryModal';
-import { RolloverToBudgetMenuModal } from './modals/RolloverToBudgetMenuModal';
import { ScheduledTransactionMenuModal } from './modals/ScheduledTransactionMenuModal';
import { SelectLinkedAccountsModal } from './modals/SelectLinkedAccountsModal';
import { SimpleFinInitialiseModal } from './modals/SimpleFinInitialiseModal';
import { SingleInputModal } from './modals/SingleInputModal';
+import { TrackingBalanceMenuModal } from './modals/TrackingBalanceMenuModal';
+import { TrackingBudgetMenuModal } from './modals/TrackingBudgetMenuModal';
+import { TrackingBudgetMonthMenuModal } from './modals/TrackingBudgetMonthMenuModal';
+import { TrackingBudgetSummaryModal } from './modals/TrackingBudgetSummaryModal';
import { TransferModal } from './modals/TransferModal';
import { DiscoverSchedules } from './schedules/DiscoverSchedules';
import { PostsOfflineNotification } from './schedules/PostsOfflineNotification';
@@ -310,13 +310,13 @@ export function Modals() {
/>
);
- case 'rollover-budget-summary':
+ case 'envelope-budget-summary':
return (
<NamespaceContext.Provider
key={name}
value={monthUtils.sheetForMonth(options.month)}
>
- <RolloverBudgetSummaryModal
+ <EnvelopeBudgetSummaryModal
key={name}
month={options.month}
onBudgetAction={options.onBudgetAction}
@@ -324,8 +324,10 @@ export function Modals() {
</NamespaceContext.Provider>
);
- case 'report-budget-summary':
- return <ReportBudgetSummaryModal key={name} month={options.month} />;
+ case 'tracking-budget-summary':
+ return (
+ <TrackingBudgetSummaryModal key={name} month={options.month} />
+ );
case 'schedule-edit':
return (
@@ -379,13 +381,13 @@ export function Modals() {
/>
);
- case 'rollover-budget-menu':
+ case 'envelope-budget-menu':
return (
<NamespaceContext.Provider
key={name}
value={monthUtils.sheetForMonth(options.month)}
>
- <RolloverBudgetMenuModal
+ <EnvelopeBudgetMenuModal
categoryId={options.categoryId}
onUpdateBudget={options.onUpdateBudget}
onCopyLastMonthAverage={options.onCopyLastMonthAverage}
@@ -395,13 +397,13 @@ export function Modals() {
</NamespaceContext.Provider>
);
- case 'report-budget-menu':
+ case 'tracking-budget-menu':
return (
<NamespaceContext.Provider
key={name}
value={monthUtils.sheetForMonth(options.month)}
>
- <ReportBudgetMenuModal
+ <TrackingBudgetMenuModal
categoryId={options.categoryId}
onUpdateBudget={options.onUpdateBudget}
onCopyLastMonthAverage={options.onCopyLastMonthAverage}
@@ -436,13 +438,13 @@ export function Modals() {
/>
);
- case 'rollover-balance-menu':
+ case 'envelope-balance-menu':
return (
<NamespaceContext.Provider
key={name}
value={monthUtils.sheetForMonth(options.month)}
>
- <RolloverBalanceMenuModal
+ <EnvelopeBalanceMenuModal
categoryId={options.categoryId}
onCarryover={options.onCarryover}
onTransfer={options.onTransfer}
@@ -451,13 +453,13 @@ export function Modals() {
</NamespaceContext.Provider>
);
- case 'rollover-summary-to-budget-menu':
+ case 'envelope-summary-to-budget-menu':
return (
<NamespaceContext.Provider
key={name}
value={monthUtils.sheetForMonth(options.month)}
>
- <RolloverToBudgetMenuModal
+ <EnvelopeToBudgetMenuModal
onTransfer={options.onTransfer}
onCover={options.onCover}
onHoldBuffer={options.onHoldBuffer}
@@ -479,13 +481,13 @@ export function Modals() {
</NamespaceContext.Provider>
);
- case 'report-balance-menu':
+ case 'tracking-balance-menu':
return (
<NamespaceContext.Provider
key={name}
value={monthUtils.sheetForMonth(options.month)}
>
- <ReportBalanceMenuModal
+ <TrackingBalanceMenuModal
categoryId={options.categoryId}
onCarryover={options.onCarryover}
/>
@@ -537,13 +539,13 @@ export function Modals() {
/>
);
- case 'rollover-budget-month-menu':
+ case 'envelope-budget-month-menu':
return (
<NamespaceContext.Provider
key={name}
value={monthUtils.sheetForMonth(options.month)}
>
- <RolloverBudgetMonthMenuModal
+ <EnvelopeBudgetMonthMenuModal
month={options.month}
onBudgetAction={options.onBudgetAction}
onEditNotes={options.onEditNotes}
@@ -551,13 +553,13 @@ export function Modals() {
</NamespaceContext.Provider>
);
- case 'report-budget-month-menu':
+ case 'tracking-budget-month-menu':
return (
<NamespaceContext.Provider
key={name}
value={monthUtils.sheetForMonth(options.month)}
>
- <ReportBudgetMonthMenuModal
+ <TrackingBudgetMonthMenuModal
month={options.month}
onBudgetAction={options.onBudgetAction}
onEditNotes={options.onEditNotes}
diff --git a/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx b/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx
index c5d0a2462b..ea5dc0d57b 100644
--- a/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx
+++ b/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx
@@ -13,7 +13,7 @@ import { Trans, useTranslation } from 'react-i18next';
import { css } from 'glamor';
-import { reportBudget, rolloverBudget } from 'loot-core/client/queries';
+import { trackingBudget, envelopeBudget } from 'loot-core/client/queries';
import { integerToCurrency } from 'loot-core/shared/util';
import { getNormalisedString } from 'loot-core/src/shared/normalisation';
import {
@@ -26,7 +26,7 @@ import { useSyncedPref } from '../../hooks/useSyncedPref';
import { SvgSplit } from '../../icons/v0';
import { useResponsive } from '../../ResponsiveProvider';
import { type CSSProperties, theme, styles } from '../../style';
-import { useRolloverSheetValue } from '../budget/rollover/RolloverComponents';
+import { useEnvelopeSheetValue } from '../budget/envelope/EnvelopeBudgetComponents';
import { makeAmountFullStyle } from '../budget/util';
import { Text } from '../common/Text';
import { TextOneLine } from '../common/TextOneLine';
@@ -383,15 +383,15 @@ function CategoryItem({
const balanceBinding =
budgetType === 'rollover'
- ? rolloverBudget.catBalance(item.id)
- : reportBudget.catBalance(item.id);
+ ? envelopeBudget.catBalance(item.id)
+ : trackingBudget.catBalance(item.id);
const balance = useSheetValue<
- 'rollover-budget' | 'report-budget',
+ 'envelope-budget' | 'tracking-budget',
typeof balanceBinding
>(balanceBinding);
const isToBeBudgetedItem = item.id === 'to-be-budgeted';
- const toBudget = useRolloverSheetValue(rolloverBudget.toBudget) ?? 0;
+ const toBudget = useEnvelopeSheetValue(envelopeBudget.toBudget) ?? 0;
return (
<div
diff --git a/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx b/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx
index 7e97f7cf2c..e5a600d7f6 100644
--- a/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx
+++ b/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx
@@ -63,11 +63,11 @@ type BalanceWithCarryoverProps = Omit<
ComponentPropsWithoutRef<typeof CellValue>,
'binding'
> & {
- carryover: Binding<'rollover-budget', 'carryover'>;
- balance: Binding<'rollover-budget', 'leftover'>;
- goal: Binding<'rollover-budget', 'goal'>;
- budgeted: Binding<'rollover-budget', 'budget'>;
- longGoal: Binding<'rollover-budget', 'long-goal'>;
+ carryover: Binding<'envelope-budget', 'carryover'>;
+ balance: Binding<'envelope-budget', 'leftover'>;
+ goal: Binding<'envelope-budget', 'goal'>;
+ budgeted: Binding<'envelope-budget', 'budget'>;
+ longGoal: Binding<'envelope-budget', 'long-goal'>;
disabled?: boolean;
CarryoverIndicator?: ComponentType<CarryoverIndicatorProps>;
};
diff --git a/packages/desktop-client/src/components/budget/BudgetSummaries.tsx b/packages/desktop-client/src/components/budget/BudgetSummaries.tsx
index 759d51aed2..3315ab3365 100644
--- a/packages/desktop-client/src/components/budget/BudgetSummaries.tsx
+++ b/packages/desktop-client/src/components/budget/BudgetSummaries.tsx
@@ -14,12 +14,12 @@ import { addMonths, subMonths } from 'loot-core/src/shared/months';
import { useResizeObserver } from '../../hooks/useResizeObserver';
import { View } from '../common/View';
+import { type BudgetSummary as EnvelopeBudgetSummary } from './envelope/budgetsummary/BudgetSummary';
import { MonthsContext } from './MonthsContext';
-import { type BudgetSummary as ReportBudgetSummary } from './report/budgetsummary/BudgetSummary';
-import { type BudgetSummary as RolloverBudgetSummary } from './rollover/budgetsummary/BudgetSummary';
+import { type BudgetSummary as TrackingBudgetSummary } from './tracking/budgetsummary/BudgetSummary';
type BudgetSummariesProps = {
- SummaryComponent: typeof ReportBudgetSummary | typeof RolloverBudgetSummary;
+ SummaryComponent: typeof TrackingBudgetSummary | typeof EnvelopeBudgetSummary;
};
export function BudgetSummaries({ SummaryComponent }: BudgetSummariesProps) {
diff --git a/packages/desktop-client/src/components/budget/rollover/BalanceMenu.tsx b/packages/desktop-client/src/components/budget/envelope/BalanceMenu.tsx
similarity index 84%
rename from packages/desktop-client/src/components/budget/rollover/BalanceMenu.tsx
rename to packages/desktop-client/src/components/budget/envelope/BalanceMenu.tsx
index 95817cfac0..83244cf4a9 100644
--- a/packages/desktop-client/src/components/budget/rollover/BalanceMenu.tsx
+++ b/packages/desktop-client/src/components/budget/envelope/BalanceMenu.tsx
@@ -1,11 +1,11 @@
import React, { type ComponentPropsWithoutRef } from 'react';
import { useTranslation } from 'react-i18next';
-import { rolloverBudget } from 'loot-core/src/client/queries';
+import { envelopeBudget } from 'loot-core/src/client/queries';
import { Menu } from '../../common/Menu';
-import { useRolloverSheetValue } from './RolloverComponents';
+import { useEnvelopeSheetValue } from './EnvelopeBudgetComponents';
type BalanceMenuProps = Omit<
ComponentPropsWithoutRef<typeof Menu>,
@@ -26,10 +26,10 @@ export function BalanceMenu({
}: BalanceMenuProps) {
const { t } = useTranslation();
- const carryover = useRolloverSheetValue(
- rolloverBudget.catCarryover(categoryId),
+ const carryover = useEnvelopeSheetValue(
+ envelopeBudget.catCarryover(categoryId),
);
- const balance = useRolloverSheetValue(rolloverBudget.catBalance(categoryId));
+ const balance = useEnvelopeSheetValue(envelopeBudget.catBalance(categoryId));
return (
<Menu
diff --git a/packages/desktop-client/src/components/budget/rollover/BalanceMovementMenu.tsx b/packages/desktop-client/src/components/budget/envelope/BalanceMovementMenu.tsx
similarity index 88%
rename from packages/desktop-client/src/components/budget/rollover/BalanceMovementMenu.tsx
rename to packages/desktop-client/src/components/budget/envelope/BalanceMovementMenu.tsx
index 02fe807319..eed672b2ac 100644
--- a/packages/desktop-client/src/components/budget/rollover/BalanceMovementMenu.tsx
+++ b/packages/desktop-client/src/components/budget/envelope/BalanceMovementMenu.tsx
@@ -1,10 +1,10 @@
import React, { useState } from 'react';
-import { rolloverBudget } from 'loot-core/src/client/queries';
+import { envelopeBudget } from 'loot-core/src/client/queries';
import { BalanceMenu } from './BalanceMenu';
import { CoverMenu } from './CoverMenu';
-import { useRolloverSheetValue } from './RolloverComponents';
+import { useEnvelopeSheetValue } from './EnvelopeBudgetComponents';
import { TransferMenu } from './TransferMenu';
type BalanceMovementMenuProps = {
@@ -20,8 +20,8 @@ export function BalanceMovementMenu({
onBudgetAction,
onClose = () => {},
}: BalanceMovementMenuProps) {
- const catBalance = useRolloverSheetValue(
- rolloverBudget.catBalance(categoryId),
+ const catBalance = useEnvelopeSheetValue(
+ envelopeBudget.catBalance(categoryId),
);
const [menu, setMenu] = useState('menu');
diff --git a/packages/desktop-client/src/components/budget/rollover/BudgetMenu.tsx b/packages/desktop-client/src/components/budget/envelope/BudgetMenu.tsx
similarity index 100%
rename from packages/desktop-client/src/components/budget/rollover/BudgetMenu.tsx
rename to packages/desktop-client/src/components/budget/envelope/BudgetMenu.tsx
diff --git a/packages/desktop-client/src/components/budget/rollover/CoverMenu.tsx b/packages/desktop-client/src/components/budget/envelope/CoverMenu.tsx
similarity index 100%
rename from packages/desktop-client/src/components/budget/rollover/CoverMenu.tsx
rename to packages/desktop-client/src/components/budget/envelope/CoverMenu.tsx
diff --git a/packages/desktop-client/src/components/budget/rollover/RolloverComponents.tsx b/packages/desktop-client/src/components/budget/envelope/EnvelopeBudgetComponents.tsx
similarity index 86%
rename from packages/desktop-client/src/components/budget/rollover/RolloverComponents.tsx
rename to packages/desktop-client/src/components/budget/envelope/EnvelopeBudgetComponents.tsx
index f1e873d006..8e940b7ce3 100644
--- a/packages/desktop-client/src/components/budget/rollover/RolloverComponents.tsx
+++ b/packages/desktop-client/src/components/budget/envelope/EnvelopeBudgetComponents.tsx
@@ -1,6 +1,6 @@
import React, { type ComponentProps, memo, useRef, useState } from 'react';
-import { rolloverBudget } from 'loot-core/src/client/queries';
+import { envelopeBudget } from 'loot-core/src/client/queries';
import { evalArithmetic } from 'loot-core/src/shared/arithmetic';
import * as monthUtils from 'loot-core/src/shared/months';
import { integerToCurrency, amountToInteger } from 'loot-core/src/shared/util';
@@ -23,28 +23,28 @@ import { makeAmountGrey } from '../util';
import { BalanceMovementMenu } from './BalanceMovementMenu';
import { BudgetMenu } from './BudgetMenu';
-export function useRolloverSheetName<
- FieldName extends SheetFields<'rollover-budget'>,
->(binding: Binding<'rollover-budget', FieldName>) {
+export function useEnvelopeSheetName<
+ FieldName extends SheetFields<'envelope-budget'>,
+>(binding: Binding<'envelope-budget', FieldName>) {
return useSheetName(binding);
}
-export function useRolloverSheetValue<
- FieldName extends SheetFields<'rollover-budget'>,
->(binding: Binding<'rollover-budget', FieldName>) {
+export function useEnvelopeSheetValue<
+ FieldName extends SheetFields<'envelope-budget'>,
+>(binding: Binding<'envelope-budget', FieldName>) {
return useSheetValue(binding);
}
-export const RolloverCellValue = <
- FieldName extends SheetFields<'rollover-budget'>,
+export const EnvelopeCellValue = <
+ FieldName extends SheetFields<'envelope-budget'>,
>(
- props: ComponentProps<typeof CellValue<'rollover-budget', FieldName>>,
+ props: ComponentProps<typeof CellValue<'envelope-budget', FieldName>>,
) => {
return <CellValue {...props} />;
};
-const RolloverSheetCell = <FieldName extends SheetFields<'rollover-budget'>>(
- props: SheetCellProps<'rollover-budget', FieldName>,
+const EnvelopeSheetCell = <FieldName extends SheetFields<'envelope-budget'>>(
+ props: SheetCellProps<'envelope-budget', FieldName>,
) => {
return <SheetCell {...props} />;
};
@@ -73,29 +73,29 @@ export const BudgetTotalsMonth = memo(function BudgetTotalsMonth() {
>
<View style={headerLabelStyle}>
<Text style={{ color: theme.tableHeaderText }}>Budgeted</Text>
- <RolloverCellValue
- binding={rolloverBudget.totalBudgeted}
+ <EnvelopeCellValue
+ binding={envelopeBudget.totalBudgeted}
type="financial"
>
{props => (
<CellValueText {...props} value={-props.value} style={cellStyle} />
)}
- </RolloverCellValue>
+ </EnvelopeCellValue>
</View>
<View style={headerLabelStyle}>
<Text style={{ color: theme.tableHeaderText }}>Spent</Text>
- <RolloverCellValue binding={rolloverBudget.totalSpent} type="financial">
+ <EnvelopeCellValue binding={envelopeBudget.totalSpent} type="financial">
{props => <CellValueText {...props} style={cellStyle} />}
- </RolloverCellValue>
+ </EnvelopeCellValue>
</View>
<View style={headerLabelStyle}>
<Text style={{ color: theme.tableHeaderText }}>Balance</Text>
- <RolloverCellValue
- binding={rolloverBudget.totalBalance}
+ <EnvelopeCellValue
+ binding={envelopeBudget.totalBalance}
type="financial"
>
{props => <CellValueText {...props} style={cellStyle} />}
- </RolloverCellValue>
+ </EnvelopeCellValue>
</View>
</View>
);
@@ -135,27 +135,27 @@ export const ExpenseGroupMonth = memo(function ExpenseGroupMonth({
: theme.budgetHeaderOtherMonth,
}}
>
- <RolloverSheetCell
+ <EnvelopeSheetCell
name="budgeted"
width="flex"
textAlign="right"
style={{ fontWeight: 600, ...styles.tnum }}
valueProps={{
- binding: rolloverBudget.groupBudgeted(id),
+ binding: envelopeBudget.groupBudgeted(id),
type: 'financial',
}}
/>
- <RolloverSheetCell
+ <EnvelopeSheetCell
name="spent"
width="flex"
textAlign="right"
style={{ fontWeight: 600, ...styles.tnum }}
valueProps={{
- binding: rolloverBudget.groupSumAmount(id),
+ binding: envelopeBudget.groupSumAmount(id),
type: 'financial',
}}
/>
- <RolloverSheetCell
+ <EnvelopeSheetCell
name="balance"
width="flex"
textAlign="right"
@@ -165,7 +165,7 @@ export const ExpenseGroupMonth = memo(function ExpenseGroupMonth({
...styles.tnum,
}}
valueProps={{
- binding: rolloverBudget.groupBalance(id),
+ binding: envelopeBudget.groupBalance(id),
type: 'financial',
privacyFilter: {
style: {
@@ -302,7 +302,7 @@ export const ExpenseCategoryMonth = memo(function ExpenseCategoryMonth({
</Popover>
</View>
)}
- <RolloverSheetCell
+ <EnvelopeSheetCell
name="budget"
exposed={editing}
focused={editing}
@@ -321,7 +321,7 @@ export const ExpenseCategoryMonth = memo(function ExpenseCategoryMonth({
},
}}
valueProps={{
- binding: rolloverBudget.catBudgeted(category.id),
+ binding: envelopeBudget.catBudgeted(category.id),
type: 'financial',
getValueStyle: makeAmountGrey,
formatExpr: expr => {
@@ -352,8 +352,8 @@ export const ExpenseCategoryMonth = memo(function ExpenseCategoryMonth({
data-testid="category-month-spent"
onClick={() => onShowActivity(category.id, month)}
>
- <RolloverCellValue
- binding={rolloverBudget.catSumAmount(category.id)}
+ <EnvelopeCellValue
+ binding={envelopeBudget.catSumAmount(category.id)}
type="financial"
>
{props => (
@@ -366,7 +366,7 @@ export const ExpenseCategoryMonth = memo(function ExpenseCategoryMonth({
}}
/>
)}
- </RolloverCellValue>
+ </EnvelopeCellValue>
</span>
</Field>
<Field
@@ -379,11 +379,11 @@ export const ExpenseCategoryMonth = memo(function ExpenseCategoryMonth({
onClick={() => setBalanceMenuOpen(true)}
>
<BalanceWithCarryover
- carryover={rolloverBudget.catCarryover(category.id)}
- balance={rolloverBudget.catBalance(category.id)}
- goal={rolloverBudget.catGoal(category.id)}
- budgeted={rolloverBudget.catBudgeted(category.id)}
- longGoal={rolloverBudget.catLongGoal(category.id)}
+ carryover={envelopeBudget.catCarryover(category.id)}
+ balance={envelopeBudget.catBalance(category.id)}
+ goal={envelopeBudget.catGoal(category.id)}
+ budgeted={envelopeBudget.catBudgeted(category.id)}
+ longGoal={envelopeBudget.catLongGoal(category.id)}
/>
</span>
@@ -412,7 +412,7 @@ type IncomeGroupMonthProps = {
export function IncomeGroupMonth({ month }: IncomeGroupMonthProps) {
return (
<View style={{ flex: 1 }}>
- <RolloverSheetCell
+ <EnvelopeSheetCell
name="received"
width="flex"
textAlign="right"
@@ -425,7 +425,7 @@ export function IncomeGroupMonth({ month }: IncomeGroupMonthProps) {
: theme.budgetHeaderOtherMonth,
}}
valueProps={{
- binding: rolloverBudget.groupIncomeReceived,
+ binding: envelopeBudget.groupIncomeReceived,
type: 'financial',
privacyFilter: {
style: {
@@ -465,8 +465,8 @@ export function IncomeCategoryMonth({
}}
>
<span onClick={() => onShowActivity(category.id, month)}>
- <RolloverCellValue
- binding={rolloverBudget.catSumAmount(category.id)}
+ <EnvelopeCellValue
+ binding={envelopeBudget.catSumAmount(category.id)}
type="financial"
>
{props => (
@@ -478,7 +478,7 @@ export function IncomeCategoryMonth({
}}
/>
)}
- </RolloverCellValue>
+ </EnvelopeCellValue>
</span>
</Field>
</View>
diff --git a/packages/desktop-client/src/components/budget/rollover/RolloverContext.tsx b/packages/desktop-client/src/components/budget/envelope/EnvelopeBudgetContext.tsx
similarity index 67%
rename from packages/desktop-client/src/components/budget/rollover/RolloverContext.tsx
rename to packages/desktop-client/src/components/budget/envelope/EnvelopeBudgetContext.tsx
index 81e9f18cbe..9819cf1687 100644
--- a/packages/desktop-client/src/components/budget/rollover/RolloverContext.tsx
+++ b/packages/desktop-client/src/components/budget/envelope/EnvelopeBudgetContext.tsx
@@ -2,14 +2,14 @@ import React, { type ReactNode, createContext, useContext } from 'react';
import * as monthUtils from 'loot-core/src/shared/months';
-type RolloverContextDefinition = {
+type EnvelopeBudgetContextDefinition = {
summaryCollapsed: boolean;
onBudgetAction: (month: string, action: string, arg?: unknown) => void;
onToggleSummaryCollapse: () => void;
currentMonth: string;
};
-const RolloverContext = createContext<RolloverContextDefinition>({
+const EnvelopeBudgetContext = createContext<EnvelopeBudgetContextDefinition>({
summaryCollapsed: false,
onBudgetAction: () => {
throw new Error('Unitialised context method called: onBudgetAction');
@@ -22,19 +22,22 @@ const RolloverContext = createContext<RolloverContextDefinition>({
currentMonth: 'unknown',
});
-type RolloverProviderProps = Omit<RolloverContextDefinition, 'currentMonth'> & {
+type EnvelopeBudgetProviderProps = Omit<
+ EnvelopeBudgetContextDefinition,
+ 'currentMonth'
+> & {
children: ReactNode;
};
-export function RolloverProvider({
+export function EnvelopeBudgetProvider({
summaryCollapsed,
onBudgetAction,
onToggleSummaryCollapse,
children,
-}: RolloverProviderProps) {
+}: EnvelopeBudgetProviderProps) {
const currentMonth = monthUtils.currentMonth();
return (
- <RolloverContext.Provider
+ <EnvelopeBudgetContext.Provider
value={{
currentMonth,
summaryCollapsed,
@@ -43,10 +46,10 @@ export function RolloverProvider({
}}
>
{children}
- </RolloverContext.Provider>
+ </EnvelopeBudgetContext.Provider>
);
}
-export function useRollover() {
- return useContext(RolloverContext);
+export function useEnvelopeBudget() {
+ return useContext(EnvelopeBudgetContext);
}
diff --git a/packages/desktop-client/src/components/budget/rollover/HoldMenu.tsx b/packages/desktop-client/src/components/budget/envelope/HoldMenu.tsx
similarity index 100%
rename from packages/desktop-client/src/components/budget/rollover/HoldMenu.tsx
rename to packages/desktop-client/src/components/budget/envelope/HoldMenu.tsx
diff --git a/packages/desktop-client/src/components/budget/rollover/TransferMenu.tsx b/packages/desktop-client/src/components/budget/envelope/TransferMenu.tsx
similarity index 100%
rename from packages/desktop-client/src/components/budget/rollover/TransferMenu.tsx
rename to packages/desktop-client/src/components/budget/envelope/TransferMenu.tsx
diff --git a/packages/desktop-client/src/components/budget/rollover/budgetsummary/BudgetMonthMenu.tsx b/packages/desktop-client/src/components/budget/envelope/budgetsummary/BudgetMonthMenu.tsx
similarity index 100%
rename from packages/desktop-client/src/components/budget/rollover/budgetsummary/BudgetMonthMenu.tsx
rename to packages/desktop-client/src/components/budget/envelope/budgetsummary/BudgetMonthMenu.tsx
diff --git a/packages/desktop-client/src/components/budget/rollover/budgetsummary/BudgetSummary.tsx b/packages/desktop-client/src/components/budget/envelope/budgetsummary/BudgetSummary.tsx
similarity index 98%
rename from packages/desktop-client/src/components/budget/rollover/budgetsummary/BudgetSummary.tsx
rename to packages/desktop-client/src/components/budget/envelope/budgetsummary/BudgetSummary.tsx
index 746f00c395..71d118844b 100644
--- a/packages/desktop-client/src/components/budget/rollover/budgetsummary/BudgetSummary.tsx
+++ b/packages/desktop-client/src/components/budget/envelope/budgetsummary/BudgetSummary.tsx
@@ -12,7 +12,7 @@ import { Popover } from '../../../common/Popover';
import { View } from '../../../common/View';
import { NotesButton } from '../../../NotesButton';
import { NamespaceContext } from '../../../spreadsheet/NamespaceContext';
-import { useRollover } from '../RolloverContext';
+import { useEnvelopeBudget } from '../EnvelopeBudgetContext';
import { BudgetMonthMenu } from './BudgetMonthMenu';
import { ToBudget } from './ToBudget';
@@ -28,7 +28,7 @@ export function BudgetSummary({ month }: BudgetSummaryProps) {
summaryCollapsed: collapsed,
onBudgetAction,
onToggleSummaryCollapse,
- } = useRollover();
+ } = useEnvelopeBudget();
const [menuOpen, setMenuOpen] = useState(false);
const triggerRef = useRef(null);
diff --git a/packages/desktop-client/src/components/budget/rollover/budgetsummary/ToBudget.tsx b/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudget.tsx
similarity index 93%
rename from packages/desktop-client/src/components/budget/rollover/budgetsummary/ToBudget.tsx
rename to packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudget.tsx
index a925f0d519..bc4fa2000a 100644
--- a/packages/desktop-client/src/components/budget/rollover/budgetsummary/ToBudget.tsx
+++ b/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudget.tsx
@@ -1,13 +1,13 @@
import React, { useRef, useState } from 'react';
-import { rolloverBudget } from 'loot-core/src/client/queries';
+import { envelopeBudget } from 'loot-core/src/client/queries';
import { type CSSProperties } from '../../../../style';
import { Popover } from '../../../common/Popover';
import { View } from '../../../common/View';
import { CoverMenu } from '../CoverMenu';
+import { useEnvelopeSheetValue } from '../EnvelopeBudgetComponents';
import { HoldMenu } from '../HoldMenu';
-import { useRolloverSheetValue } from '../RolloverComponents';
import { TransferMenu } from '../TransferMenu';
import { ToBudgetAmount } from './ToBudgetAmount';
@@ -31,8 +31,8 @@ export function ToBudget({
}: ToBudgetProps) {
const [menuOpen, setMenuOpen] = useState<string | null>(null);
const triggerRef = useRef(null);
- const sheetValue = useRolloverSheetValue({
- name: rolloverBudget.toBudget,
+ const sheetValue = useEnvelopeSheetValue({
+ name: envelopeBudget.toBudget,
value: 0,
});
const availableValue = sheetValue;
diff --git a/packages/desktop-client/src/components/budget/rollover/budgetsummary/ToBudgetAmount.tsx b/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetAmount.tsx
similarity index 89%
rename from packages/desktop-client/src/components/budget/rollover/budgetsummary/ToBudgetAmount.tsx
rename to packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetAmount.tsx
index 36a055bd9b..a03f2560d1 100644
--- a/packages/desktop-client/src/components/budget/rollover/budgetsummary/ToBudgetAmount.tsx
+++ b/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetAmount.tsx
@@ -2,7 +2,7 @@ import React from 'react';
import { css } from 'glamor';
-import { rolloverBudget } from 'loot-core/src/client/queries';
+import { envelopeBudget } from 'loot-core/src/client/queries';
import { theme, styles, type CSSProperties } from '../../../../style';
import { Block } from '../../../common/Block';
@@ -11,9 +11,9 @@ import { View } from '../../../common/View';
import { PrivacyFilter } from '../../../PrivacyFilter';
import { useFormat } from '../../../spreadsheet/useFormat';
import {
- useRolloverSheetName,
- useRolloverSheetValue,
-} from '../RolloverComponents';
+ useEnvelopeSheetName,
+ useEnvelopeSheetValue,
+} from '../EnvelopeBudgetComponents';
import { TotalsList } from './TotalsList';
@@ -32,9 +32,9 @@ export function ToBudgetAmount({
onClick,
isTotalsListTooltipDisabled = false,
}: ToBudgetAmountProps) {
- const sheetName = useRolloverSheetName(rolloverBudget.toBudget);
- const sheetValue = useRolloverSheetValue({
- name: rolloverBudget.toBudget,
+ const sheetName = useEnvelopeSheetName(envelopeBudget.toBudget);
+ const sheetValue = useEnvelopeSheetValue({
+ name: envelopeBudget.toBudget,
value: 0,
});
const format = useFormat();
diff --git a/packages/desktop-client/src/components/budget/rollover/budgetsummary/ToBudgetMenu.tsx b/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetMenu.tsx
similarity index 87%
rename from packages/desktop-client/src/components/budget/rollover/budgetsummary/ToBudgetMenu.tsx
rename to packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetMenu.tsx
index c115e0747f..c3b75d1dbf 100644
--- a/packages/desktop-client/src/components/budget/rollover/budgetsummary/ToBudgetMenu.tsx
+++ b/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetMenu.tsx
@@ -1,9 +1,9 @@
import React, { type ComponentPropsWithoutRef } from 'react';
-import { rolloverBudget } from 'loot-core/client/queries';
+import { envelopeBudget } from 'loot-core/client/queries';
import { Menu } from '../../../common/Menu';
-import { useRolloverSheetValue } from '../RolloverComponents';
+import { useEnvelopeSheetValue } from '../EnvelopeBudgetComponents';
type ToBudgetMenuProps = Omit<
ComponentPropsWithoutRef<typeof Menu>,
@@ -21,8 +21,8 @@ export function ToBudgetMenu({
onResetHoldBuffer,
...props
}: ToBudgetMenuProps) {
- const toBudget = useRolloverSheetValue(rolloverBudget.toBudget) ?? 0;
- const forNextMonth = useRolloverSheetValue(rolloverBudget.forNextMonth);
+ const toBudget = useEnvelopeSheetValue(envelopeBudget.toBudget) ?? 0;
+ const forNextMonth = useEnvelopeSheetValue(envelopeBudget.forNextMonth);
const items = [
...(toBudget > 0
? [
diff --git a/packages/desktop-client/src/components/budget/rollover/budgetsummary/TotalsList.tsx b/packages/desktop-client/src/components/budget/envelope/budgetsummary/TotalsList.tsx
similarity index 79%
rename from packages/desktop-client/src/components/budget/rollover/budgetsummary/TotalsList.tsx
rename to packages/desktop-client/src/components/budget/envelope/budgetsummary/TotalsList.tsx
index 3b6e760d0d..a72c7f3b12 100644
--- a/packages/desktop-client/src/components/budget/rollover/budgetsummary/TotalsList.tsx
+++ b/packages/desktop-client/src/components/budget/envelope/budgetsummary/TotalsList.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { rolloverBudget } from 'loot-core/src/client/queries';
+import { envelopeBudget } from 'loot-core/src/client/queries';
import { styles, type CSSProperties } from '../../../../style';
import { AlignedText } from '../../../common/AlignedText';
@@ -9,7 +9,7 @@ import { Tooltip } from '../../../common/Tooltip';
import { View } from '../../../common/View';
import { CellValueText } from '../../../spreadsheet/CellValue';
import { useFormat } from '../../../spreadsheet/useFormat';
-import { RolloverCellValue } from '../RolloverComponents';
+import { EnvelopeCellValue } from '../EnvelopeBudgetComponents';
type TotalsListProps = {
prevMonthName: string;
@@ -42,8 +42,8 @@ export function TotalsList({ prevMonthName, style }: TotalsListProps) {
<AlignedText
left="Income:"
right={
- <RolloverCellValue
- binding={rolloverBudget.totalIncome}
+ <EnvelopeCellValue
+ binding={envelopeBudget.totalIncome}
type="financial"
/>
}
@@ -51,8 +51,8 @@ export function TotalsList({ prevMonthName, style }: TotalsListProps) {
<AlignedText
left="From Last Month:"
right={
- <RolloverCellValue
- binding={rolloverBudget.fromLastMonth}
+ <EnvelopeCellValue
+ binding={envelopeBudget.fromLastMonth}
type="financial"
/>
}
@@ -61,16 +61,16 @@ export function TotalsList({ prevMonthName, style }: TotalsListProps) {
}
placement="bottom end"
>
- <RolloverCellValue
- binding={rolloverBudget.incomeAvailable}
+ <EnvelopeCellValue
+ binding={envelopeBudget.incomeAvailable}
type="financial"
>
{props => <CellValueText {...props} style={{ fontWeight: 600 }} />}
- </RolloverCellValue>
+ </EnvelopeCellValue>
</Tooltip>
- <RolloverCellValue
- binding={rolloverBudget.lastMonthOverspent}
+ <EnvelopeCellValue
+ binding={envelopeBudget.lastMonthOverspent}
type="financial"
>
{props => (
@@ -83,10 +83,10 @@ export function TotalsList({ prevMonthName, style }: TotalsListProps) {
}}
/>
)}
- </RolloverCellValue>
+ </EnvelopeCellValue>
- <RolloverCellValue
- binding={rolloverBudget.totalBudgeted}
+ <EnvelopeCellValue
+ binding={envelopeBudget.totalBudgeted}
type="financial"
>
{props => (
@@ -99,10 +99,10 @@ export function TotalsList({ prevMonthName, style }: TotalsListProps) {
}}
/>
)}
- </RolloverCellValue>
+ </EnvelopeCellValue>
- <RolloverCellValue
- binding={rolloverBudget.forNextMonth}
+ <EnvelopeCellValue
+ binding={envelopeBudget.forNextMonth}
type="financial"
>
{props => (
@@ -115,7 +115,7 @@ export function TotalsList({ prevMonthName, style }: TotalsListProps) {
}}
/>
)}
- </RolloverCellValue>
+ </EnvelopeCellValue>
</View>
<View>
diff --git a/packages/desktop-client/src/components/budget/index.tsx b/packages/desktop-client/src/components/budget/index.tsx
index af22d5b6e4..397210c867 100644
--- a/packages/desktop-client/src/components/budget/index.tsx
+++ b/packages/desktop-client/src/components/budget/index.tsx
@@ -31,36 +31,36 @@ import { View } from '../common/View';
import { NamespaceContext } from '../spreadsheet/NamespaceContext';
import { DynamicBudgetTable } from './DynamicBudgetTable';
-import * as report from './report/ReportComponents';
-import { ReportProvider } from './report/ReportContext';
-import * as rollover from './rollover/RolloverComponents';
-import { RolloverProvider } from './rollover/RolloverContext';
+import * as envelopeBudget from './envelope/EnvelopeBudgetComponents';
+import { EnvelopeBudgetProvider } from './envelope/EnvelopeBudgetContext';
+import * as trackingBudget from './tracking/TrackingBudgetComponents';
+import { TrackingBudgetProvider } from './tracking/TrackingBudgetContext';
import { prewarmAllMonths, prewarmMonth } from './util';
-type ReportComponents = {
- SummaryComponent: typeof report.BudgetSummary;
- ExpenseCategoryComponent: typeof report.ExpenseCategoryMonth;
- ExpenseGroupComponent: typeof report.ExpenseGroupMonth;
- IncomeCategoryComponent: typeof report.IncomeCategoryMonth;
- IncomeGroupComponent: typeof report.IncomeGroupMonth;
- BudgetTotalsComponent: typeof report.BudgetTotalsMonth;
- IncomeHeaderComponent: typeof report.IncomeHeaderMonth;
+type TrackingReportComponents = {
+ SummaryComponent: typeof trackingBudget.BudgetSummary;
+ ExpenseCategoryComponent: typeof trackingBudget.ExpenseCategoryMonth;
+ ExpenseGroupComponent: typeof trackingBudget.ExpenseGroupMonth;
+ IncomeCategoryComponent: typeof trackingBudget.IncomeCategoryMonth;
+ IncomeGroupComponent: typeof trackingBudget.IncomeGroupMonth;
+ BudgetTotalsComponent: typeof trackingBudget.BudgetTotalsMonth;
+ IncomeHeaderComponent: typeof trackingBudget.IncomeHeaderMonth;
};
-type RolloverComponents = {
- SummaryComponent: typeof RolloverBudgetSummary;
- ExpenseCategoryComponent: typeof rollover.ExpenseCategoryMonth;
- ExpenseGroupComponent: typeof rollover.ExpenseGroupMonth;
- IncomeCategoryComponent: typeof rollover.IncomeCategoryMonth;
- IncomeGroupComponent: typeof rollover.IncomeGroupMonth;
- BudgetTotalsComponent: typeof rollover.BudgetTotalsMonth;
- IncomeHeaderComponent: typeof rollover.IncomeHeaderMonth;
+type EnvelopeBudgetComponents = {
+ SummaryComponent: typeof EnvelopeBudgetSummary;
+ ExpenseCategoryComponent: typeof envelopeBudget.ExpenseCategoryMonth;
+ ExpenseGroupComponent: typeof envelopeBudget.ExpenseGroupMonth;
+ IncomeCategoryComponent: typeof envelopeBudget.IncomeCategoryMonth;
+ IncomeGroupComponent: typeof envelopeBudget.IncomeGroupMonth;
+ BudgetTotalsComponent: typeof envelopeBudget.BudgetTotalsMonth;
+ IncomeHeaderComponent: typeof envelopeBudget.IncomeHeaderMonth;
};
type BudgetInnerProps = {
accountId?: string;
- reportComponents: ReportComponents;
- rolloverComponents: RolloverComponents;
+ trackingComponents: TrackingReportComponents;
+ envelopeComponents: EnvelopeBudgetComponents;
};
function BudgetInner(props: BudgetInnerProps) {
@@ -316,7 +316,7 @@ function BudgetInner(props: BudgetInnerProps) {
setSummaryCollapsedPref(!summaryCollapsed);
};
- const { reportComponents, rolloverComponents } = props;
+ const { trackingComponents, envelopeComponents } = props;
if (!initialized || !categoryGroups) {
return null;
@@ -325,7 +325,7 @@ function BudgetInner(props: BudgetInnerProps) {
let table;
if (budgetType === 'report') {
table = (
- <ReportProvider
+ <TrackingBudgetProvider
summaryCollapsed={summaryCollapsed}
onBudgetAction={onBudgetAction}
onToggleSummaryCollapse={onToggleCollapse}
@@ -336,7 +336,7 @@ function BudgetInner(props: BudgetInnerProps) {
startMonth={startMonth}
monthBounds={bounds}
maxMonths={maxMonths}
- dataComponents={reportComponents}
+ dataComponents={trackingComponents}
onMonthSelect={onMonthSelect}
onDeleteCategory={onDeleteCategory}
onDeleteGroup={onDeleteGroup}
@@ -347,11 +347,11 @@ function BudgetInner(props: BudgetInnerProps) {
onReorderCategory={onReorderCategory}
onReorderGroup={onReorderGroup}
/>
- </ReportProvider>
+ </TrackingBudgetProvider>
);
} else {
table = (
- <RolloverProvider
+ <EnvelopeBudgetProvider
summaryCollapsed={summaryCollapsed}
onBudgetAction={onBudgetAction}
onToggleSummaryCollapse={onToggleCollapse}
@@ -362,7 +362,7 @@ function BudgetInner(props: BudgetInnerProps) {
startMonth={startMonth}
monthBounds={bounds}
maxMonths={maxMonths}
- dataComponents={rolloverComponents}
+ dataComponents={envelopeComponents}
onMonthSelect={onMonthSelect}
onDeleteCategory={onDeleteCategory}
onDeleteGroup={onDeleteGroup}
@@ -373,7 +373,7 @@ function BudgetInner(props: BudgetInnerProps) {
onReorderCategory={onReorderCategory}
onReorderGroup={onReorderGroup}
/>
- </RolloverProvider>
+ </EnvelopeBudgetProvider>
);
}
@@ -384,37 +384,37 @@ function BudgetInner(props: BudgetInnerProps) {
);
}
-const RolloverBudgetSummary = memo<{ month: string }>(props => {
- return <rollover.BudgetSummary {...props} />;
+const EnvelopeBudgetSummary = memo<{ month: string }>(props => {
+ return <envelopeBudget.BudgetSummary {...props} />;
});
-RolloverBudgetSummary.displayName = 'RolloverBudgetSummary';
+EnvelopeBudgetSummary.displayName = 'EnvelopeBudgetSummary';
export function Budget() {
- const reportComponents = useMemo<ReportComponents>(
+ const trackingComponents = useMemo<TrackingReportComponents>(
() => ({
- SummaryComponent: report.BudgetSummary,
- ExpenseCategoryComponent: report.ExpenseCategoryMonth,
- ExpenseGroupComponent: report.ExpenseGroupMonth,
- IncomeCategoryComponent: report.IncomeCategoryMonth,
- IncomeGroupComponent: report.IncomeGroupMonth,
- BudgetTotalsComponent: report.BudgetTotalsMonth,
- IncomeHeaderComponent: report.IncomeHeaderMonth,
+ SummaryComponent: trackingBudget.BudgetSummary,
+ ExpenseCategoryComponent: trackingBudget.ExpenseCategoryMonth,
+ ExpenseGroupComponent: trackingBudget.ExpenseGroupMonth,
+ IncomeCategoryComponent: trackingBudget.IncomeCategoryMonth,
+ IncomeGroupComponent: trackingBudget.IncomeGroupMonth,
+ BudgetTotalsComponent: trackingBudget.BudgetTotalsMonth,
+ IncomeHeaderComponent: trackingBudget.IncomeHeaderMonth,
}),
- [report],
+ [trackingBudget],
);
- const rolloverComponents = useMemo<RolloverComponents>(
+ const envelopeComponents = useMemo<EnvelopeBudgetComponents>(
() => ({
- SummaryComponent: RolloverBudgetSummary,
- ExpenseCategoryComponent: rollover.ExpenseCategoryMonth,
- ExpenseGroupComponent: rollover.ExpenseGroupMonth,
- IncomeCategoryComponent: rollover.IncomeCategoryMonth,
- IncomeGroupComponent: rollover.IncomeGroupMonth,
- BudgetTotalsComponent: rollover.BudgetTotalsMonth,
- IncomeHeaderComponent: rollover.IncomeHeaderMonth,
+ SummaryComponent: EnvelopeBudgetSummary,
+ ExpenseCategoryComponent: envelopeBudget.ExpenseCategoryMonth,
+ ExpenseGroupComponent: envelopeBudget.ExpenseGroupMonth,
+ IncomeCategoryComponent: envelopeBudget.IncomeCategoryMonth,
+ IncomeGroupComponent: envelopeBudget.IncomeGroupMonth,
+ BudgetTotalsComponent: envelopeBudget.BudgetTotalsMonth,
+ IncomeHeaderComponent: envelopeBudget.IncomeHeaderMonth,
}),
- [rollover],
+ [envelopeBudget],
);
// In a previous iteration, the wrapper needs `overflow: hidden` for
@@ -431,8 +431,8 @@ export function Budget() {
}}
>
<BudgetInner
- reportComponents={reportComponents}
- rolloverComponents={rolloverComponents}
+ trackingComponents={trackingComponents}
+ envelopeComponents={envelopeComponents}
/>
</View>
);
diff --git a/packages/desktop-client/src/components/budget/report/BalanceMenu.tsx b/packages/desktop-client/src/components/budget/tracking/BalanceMenu.tsx
similarity index 80%
rename from packages/desktop-client/src/components/budget/report/BalanceMenu.tsx
rename to packages/desktop-client/src/components/budget/tracking/BalanceMenu.tsx
index fb5945ac2c..32c3747cc3 100644
--- a/packages/desktop-client/src/components/budget/report/BalanceMenu.tsx
+++ b/packages/desktop-client/src/components/budget/tracking/BalanceMenu.tsx
@@ -1,11 +1,11 @@
import React, { type ComponentPropsWithoutRef } from 'react';
import { useTranslation } from 'react-i18next';
-import { reportBudget } from 'loot-core/src/client/queries';
+import { trackingBudget } from 'loot-core/src/client/queries';
import { Menu } from '../../common/Menu';
-import { useReportSheetValue } from './ReportComponents';
+import { useTrackingSheetValue } from './TrackingBudgetComponents';
type BalanceMenuProps = Omit<
ComponentPropsWithoutRef<typeof Menu>,
@@ -21,7 +21,9 @@ export function BalanceMenu({
...props
}: BalanceMenuProps) {
const { t } = useTranslation();
- const carryover = useReportSheetValue(reportBudget.catCarryover(categoryId));
+ const carryover = useTrackingSheetValue(
+ trackingBudget.catCarryover(categoryId),
+ );
return (
<Menu
{...props}
diff --git a/packages/desktop-client/src/components/budget/report/BudgetMenu.tsx b/packages/desktop-client/src/components/budget/tracking/BudgetMenu.tsx
similarity index 100%
rename from packages/desktop-client/src/components/budget/report/BudgetMenu.tsx
rename to packages/desktop-client/src/components/budget/tracking/BudgetMenu.tsx
diff --git a/packages/desktop-client/src/components/budget/report/ReportComponents.tsx b/packages/desktop-client/src/components/budget/tracking/TrackingBudgetComponents.tsx
similarity index 87%
rename from packages/desktop-client/src/components/budget/report/ReportComponents.tsx
rename to packages/desktop-client/src/components/budget/tracking/TrackingBudgetComponents.tsx
index 6e7060cedc..77183251e7 100644
--- a/packages/desktop-client/src/components/budget/report/ReportComponents.tsx
+++ b/packages/desktop-client/src/components/budget/tracking/TrackingBudgetComponents.tsx
@@ -2,7 +2,7 @@
import React, { type ComponentProps, memo, useRef, useState } from 'react';
import { Trans } from 'react-i18next';
-import { reportBudget } from 'loot-core/src/client/queries';
+import { trackingBudget } from 'loot-core/src/client/queries';
import { evalArithmetic } from 'loot-core/src/shared/arithmetic';
import * as monthUtils from 'loot-core/src/shared/months';
import { integerToCurrency, amountToInteger } from 'loot-core/src/shared/util';
@@ -24,22 +24,22 @@ import { makeAmountGrey } from '../util';
import { BalanceMenu } from './BalanceMenu';
import { BudgetMenu } from './BudgetMenu';
-export const useReportSheetValue = <
- FieldName extends SheetFields<'report-budget'>,
+export const useTrackingSheetValue = <
+ FieldName extends SheetFields<'tracking-budget'>,
>(
- binding: Binding<'report-budget', FieldName>,
+ binding: Binding<'tracking-budget', FieldName>,
) => {
return useSheetValue(binding);
};
-const ReportCellValue = <FieldName extends SheetFields<'report-budget'>>(
- props: ComponentProps<typeof CellValue<'report-budget', FieldName>>,
+const TrackingCellValue = <FieldName extends SheetFields<'tracking-budget'>>(
+ props: ComponentProps<typeof CellValue<'tracking-budget', FieldName>>,
) => {
return <CellValue {...props} />;
};
-const ReportSheetCell = <FieldName extends SheetFields<'report-budget'>>(
- props: SheetCellProps<'report-budget', FieldName>,
+const TrackingSheetCell = <FieldName extends SheetFields<'tracking-budget'>>(
+ props: SheetCellProps<'tracking-budget', FieldName>,
) => {
return <SheetCell {...props} />;
};
@@ -70,28 +70,31 @@ export const BudgetTotalsMonth = memo(function BudgetTotalsMonth() {
<Text style={{ color: theme.pageTextLight }}>
<Trans>Budgeted</Trans>
</Text>
- <ReportCellValue
- binding={reportBudget.totalBudgetedExpense}
+ <TrackingCellValue
+ binding={trackingBudget.totalBudgetedExpense}
type="financial"
>
{props => <CellValueText {...props} style={cellStyle} />}
- </ReportCellValue>
+ </TrackingCellValue>
</View>
<View style={headerLabelStyle}>
<Text style={{ color: theme.pageTextLight }}>
<Trans>Spent</Trans>
</Text>
- <ReportCellValue binding={reportBudget.totalSpent} type="financial">
+ <TrackingCellValue binding={trackingBudget.totalSpent} type="financial">
{props => <CellValueText {...props} style={cellStyle} />}
- </ReportCellValue>
+ </TrackingCellValue>
</View>
<View style={headerLabelStyle}>
<Text style={{ color: theme.pageTextLight }}>
<Trans>Balance</Trans>
</Text>
- <ReportCellValue binding={reportBudget.totalLeftover} type="financial">
+ <TrackingCellValue
+ binding={trackingBudget.totalLeftover}
+ type="financial"
+ >
{props => <CellValueText {...props} style={cellStyle} />}
- </ReportCellValue>
+ </TrackingCellValue>
</View>
</View>
);
@@ -140,28 +143,28 @@ export const GroupMonth = memo(function GroupMonth({
: theme.budgetHeaderOtherMonth,
}}
>
- <ReportSheetCell
+ <TrackingSheetCell
name="budgeted"
width="flex"
textAlign="right"
style={{ fontWeight: 600, ...styles.tnum }}
valueProps={{
- binding: reportBudget.groupBudgeted(id),
+ binding: trackingBudget.groupBudgeted(id),
type: 'financial',
}}
/>
- <ReportSheetCell
+ <TrackingSheetCell
name="spent"
width="flex"
textAlign="right"
style={{ fontWeight: 600, ...styles.tnum }}
valueProps={{
- binding: reportBudget.groupSumAmount(id),
+ binding: trackingBudget.groupSumAmount(id),
type: 'financial',
}}
/>
{!group.is_income && (
- <ReportSheetCell
+ <TrackingSheetCell
name="balance"
width="flex"
textAlign="right"
@@ -171,7 +174,7 @@ export const GroupMonth = memo(function GroupMonth({
...styles.tnum,
}}
valueProps={{
- binding: reportBudget.groupBalance(id),
+ binding: trackingBudget.groupBalance(id),
type: 'financial',
privacyFilter: {
style: {
@@ -310,7 +313,7 @@ export const CategoryMonth = memo(function CategoryMonth({
</Popover>
</View>
)}
- <ReportSheetCell
+ <TrackingSheetCell
name="budget"
exposed={editing}
focused={editing}
@@ -329,7 +332,7 @@ export const CategoryMonth = memo(function CategoryMonth({
},
}}
valueProps={{
- binding: reportBudget.catBudgeted(category.id),
+ binding: trackingBudget.catBudgeted(category.id),
type: 'financial',
getValueStyle: makeAmountGrey,
formatExpr: expr => {
@@ -360,8 +363,8 @@ export const CategoryMonth = memo(function CategoryMonth({
data-testid="category-month-spent"
onClick={() => onShowActivity(category.id, month)}
>
- <ReportCellValue
- binding={reportBudget.catSumAmount(category.id)}
+ <TrackingCellValue
+ binding={trackingBudget.catSumAmount(category.id)}
type="financial"
>
{props => (
@@ -376,7 +379,7 @@ export const CategoryMonth = memo(function CategoryMonth({
}}
/>
)}
- </ReportCellValue>
+ </TrackingCellValue>
</span>
</Field>
@@ -392,11 +395,11 @@ export const CategoryMonth = memo(function CategoryMonth({
>
<BalanceWithCarryover
disabled={category.is_income}
- carryover={reportBudget.catCarryover(category.id)}
- balance={reportBudget.catBalance(category.id)}
- goal={reportBudget.catGoal(category.id)}
- budgeted={reportBudget.catBudgeted(category.id)}
- longGoal={reportBudget.catLongGoal(category.id)}
+ carryover={trackingBudget.catCarryover(category.id)}
+ balance={trackingBudget.catBalance(category.id)}
+ goal={trackingBudget.catGoal(category.id)}
+ budgeted={trackingBudget.catBudgeted(category.id)}
+ longGoal={trackingBudget.catLongGoal(category.id)}
/>
</span>
diff --git a/packages/desktop-client/src/components/budget/report/ReportContext.tsx b/packages/desktop-client/src/components/budget/tracking/TrackingBudgetContext.tsx
similarity index 83%
rename from packages/desktop-client/src/components/budget/report/ReportContext.tsx
rename to packages/desktop-client/src/components/budget/tracking/TrackingBudgetContext.tsx
index d93d8cbe66..3514f8fd0c 100644
--- a/packages/desktop-client/src/components/budget/report/ReportContext.tsx
+++ b/packages/desktop-client/src/components/budget/tracking/TrackingBudgetContext.tsx
@@ -5,18 +5,18 @@ import * as monthUtils from 'loot-core/src/shared/months';
const Context = createContext(null);
-type ReportProviderProps = {
+type TrackingBudgetProviderProps = {
summaryCollapsed: boolean;
onBudgetAction: (month: string, action: string, arg: unknown) => void;
onToggleSummaryCollapse: () => void;
children: ReactNode;
};
-export function ReportProvider({
+export function TrackingBudgetProvider({
summaryCollapsed,
onBudgetAction,
onToggleSummaryCollapse,
children,
-}: ReportProviderProps) {
+}: TrackingBudgetProviderProps) {
const currentMonth = monthUtils.currentMonth();
return (
@@ -33,6 +33,6 @@ export function ReportProvider({
);
}
-export function useReport() {
+export function useTrackingBudget() {
return useContext(Context);
}
diff --git a/packages/desktop-client/src/components/budget/report/budgetsummary/BudgetMonthMenu.tsx b/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetMonthMenu.tsx
similarity index 100%
rename from packages/desktop-client/src/components/budget/report/budgetsummary/BudgetMonthMenu.tsx
rename to packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetMonthMenu.tsx
diff --git a/packages/desktop-client/src/components/budget/report/budgetsummary/BudgetSummary.tsx b/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetSummary.tsx
similarity index 98%
rename from packages/desktop-client/src/components/budget/report/budgetsummary/BudgetSummary.tsx
rename to packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetSummary.tsx
index fc64d8153e..54dea1fb21 100644
--- a/packages/desktop-client/src/components/budget/report/budgetsummary/BudgetSummary.tsx
+++ b/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetSummary.tsx
@@ -15,7 +15,7 @@ import { Stack } from '../../../common/Stack';
import { View } from '../../../common/View';
import { NotesButton } from '../../../NotesButton';
import { NamespaceContext } from '../../../spreadsheet/NamespaceContext';
-import { useReport } from '../ReportContext';
+import { useTrackingBudget } from '../TrackingBudgetContext';
import { BudgetMonthMenu } from './BudgetMonthMenu';
import { ExpenseTotal } from './ExpenseTotal';
@@ -32,7 +32,7 @@ export function BudgetSummary({ month }: BudgetSummaryProps) {
summaryCollapsed: collapsed,
onBudgetAction,
onToggleSummaryCollapse,
- } = useReport();
+ } = useTrackingBudget();
const [menuOpen, setMenuOpen] = useState(false);
const triggerRef = useRef(null);
diff --git a/packages/desktop-client/src/components/budget/report/budgetsummary/BudgetTotal.tsx b/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetTotal.tsx
similarity index 82%
rename from packages/desktop-client/src/components/budget/report/budgetsummary/BudgetTotal.tsx
rename to packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetTotal.tsx
index 5767dace48..2fb18beec0 100644
--- a/packages/desktop-client/src/components/budget/report/budgetsummary/BudgetTotal.tsx
+++ b/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetTotal.tsx
@@ -13,18 +13,18 @@ import { type SheetFields, type Binding } from '../../../spreadsheet';
import { CellValue, CellValueText } from '../../../spreadsheet/CellValue';
type BudgetTotalProps<
- CurrentField extends SheetFields<'report-budget'>,
- TargetField extends SheetFields<'report-budget'>,
+ CurrentField extends SheetFields<'tracking-budget'>,
+ TargetField extends SheetFields<'tracking-budget'>,
> = {
title: ReactNode;
- current: Binding<'report-budget', CurrentField>;
- target: Binding<'report-budget', TargetField>;
+ current: Binding<'tracking-budget', CurrentField>;
+ target: Binding<'tracking-budget', TargetField>;
ProgressComponent: ComponentType<{ current; target }>;
style?: CSSProperties;
};
export function BudgetTotal<
- CurrentField extends SheetFields<'report-budget'>,
- TargetField extends SheetFields<'report-budget'>,
+ CurrentField extends SheetFields<'tracking-budget'>,
+ TargetField extends SheetFields<'tracking-budget'>,
>({
title,
current,
diff --git a/packages/desktop-client/src/components/budget/report/budgetsummary/ExpenseProgress.tsx b/packages/desktop-client/src/components/budget/tracking/budgetsummary/ExpenseProgress.tsx
similarity index 76%
rename from packages/desktop-client/src/components/budget/report/budgetsummary/ExpenseProgress.tsx
rename to packages/desktop-client/src/components/budget/tracking/budgetsummary/ExpenseProgress.tsx
index 7d3a8aeda1..858e565c43 100644
--- a/packages/desktop-client/src/components/budget/report/budgetsummary/ExpenseProgress.tsx
+++ b/packages/desktop-client/src/components/budget/tracking/budgetsummary/ExpenseProgress.tsx
@@ -2,18 +2,18 @@ import React from 'react';
import { theme } from '../../../../style';
import { type Binding } from '../../../spreadsheet';
-import { useReportSheetValue } from '../ReportComponents';
+import { useTrackingSheetValue } from '../TrackingBudgetComponents';
import { fraction } from './fraction';
import { PieProgress } from './PieProgress';
type ExpenseProgressProps = {
- current: Binding<'report-budget', 'total-spent'>;
- target: Binding<'report-budget', 'total-budgeted'>;
+ current: Binding<'tracking-budget', 'total-spent'>;
+ target: Binding<'tracking-budget', 'total-budgeted'>;
};
export function ExpenseProgress({ current, target }: ExpenseProgressProps) {
- let totalSpent = useReportSheetValue(current) || 0;
- const totalBudgeted = useReportSheetValue(target) || 0;
+ let totalSpent = useTrackingSheetValue(current) || 0;
+ const totalBudgeted = useTrackingSheetValue(target) || 0;
// Reverse total spent, and also set a bottom boundary of 0 (in case
// income goes into an expense category and it's "positive", don't
diff --git a/packages/desktop-client/src/components/budget/report/budgetsummary/ExpenseTotal.tsx b/packages/desktop-client/src/components/budget/tracking/budgetsummary/ExpenseTotal.tsx
similarity index 76%
rename from packages/desktop-client/src/components/budget/report/budgetsummary/ExpenseTotal.tsx
rename to packages/desktop-client/src/components/budget/tracking/budgetsummary/ExpenseTotal.tsx
index 9b82f9a682..9961e94ddb 100644
--- a/packages/desktop-client/src/components/budget/report/budgetsummary/ExpenseTotal.tsx
+++ b/packages/desktop-client/src/components/budget/tracking/budgetsummary/ExpenseTotal.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import { useTranslation } from 'react-i18next';
-import { reportBudget } from 'loot-core/src/client/queries';
+import { trackingBudget } from 'loot-core/src/client/queries';
import { type CSSProperties } from '../../../../style';
@@ -16,8 +16,8 @@ export function ExpenseTotal({ style }: ExpenseTotalProps) {
return (
<BudgetTotal
title={t('Expenses')}
- current={reportBudget.totalSpent}
- target={reportBudget.totalBudgetedExpense}
+ current={trackingBudget.totalSpent}
+ target={trackingBudget.totalBudgetedExpense}
ProgressComponent={ExpenseProgress}
style={style}
/>
diff --git a/packages/desktop-client/src/components/budget/report/budgetsummary/IncomeProgress.tsx b/packages/desktop-client/src/components/budget/tracking/budgetsummary/IncomeProgress.tsx
similarity index 100%
rename from packages/desktop-client/src/components/budget/report/budgetsummary/IncomeProgress.tsx
rename to packages/desktop-client/src/components/budget/tracking/budgetsummary/IncomeProgress.tsx
diff --git a/packages/desktop-client/src/components/budget/report/budgetsummary/IncomeTotal.tsx b/packages/desktop-client/src/components/budget/tracking/budgetsummary/IncomeTotal.tsx
similarity index 76%
rename from packages/desktop-client/src/components/budget/report/budgetsummary/IncomeTotal.tsx
rename to packages/desktop-client/src/components/budget/tracking/budgetsummary/IncomeTotal.tsx
index 1c897f35f7..8aabbff2dd 100644
--- a/packages/desktop-client/src/components/budget/report/budgetsummary/IncomeTotal.tsx
+++ b/packages/desktop-client/src/components/budget/tracking/budgetsummary/IncomeTotal.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import { useTranslation } from 'react-i18next';
-import { reportBudget } from 'loot-core/src/client/queries';
+import { trackingBudget } from 'loot-core/src/client/queries';
import { type CSSProperties } from '../../../../style';
@@ -16,8 +16,8 @@ export function IncomeTotal({ style }: IncomeTotalProps) {
return (
<BudgetTotal
title={t('Income')}
- current={reportBudget.totalIncome}
- target={reportBudget.totalBudgetedIncome}
+ current={trackingBudget.totalIncome}
+ target={trackingBudget.totalBudgetedIncome}
ProgressComponent={IncomeProgress}
style={style}
/>
diff --git a/packages/desktop-client/src/components/budget/report/budgetsummary/PieProgress.tsx b/packages/desktop-client/src/components/budget/tracking/budgetsummary/PieProgress.tsx
similarity index 100%
rename from packages/desktop-client/src/components/budget/report/budgetsummary/PieProgress.tsx
rename to packages/desktop-client/src/components/budget/tracking/budgetsummary/PieProgress.tsx
diff --git a/packages/desktop-client/src/components/budget/report/budgetsummary/Saved.tsx b/packages/desktop-client/src/components/budget/tracking/budgetsummary/Saved.tsx
similarity index 90%
rename from packages/desktop-client/src/components/budget/report/budgetsummary/Saved.tsx
rename to packages/desktop-client/src/components/budget/tracking/budgetsummary/Saved.tsx
index dec539c6e7..5fdb9e1c40 100644
--- a/packages/desktop-client/src/components/budget/report/budgetsummary/Saved.tsx
+++ b/packages/desktop-client/src/components/budget/tracking/budgetsummary/Saved.tsx
@@ -3,7 +3,7 @@ import { Trans, useTranslation } from 'react-i18next';
import { css } from 'glamor';
-import { reportBudget } from 'loot-core/src/client/queries';
+import { trackingBudget } from 'loot-core/src/client/queries';
import { theme, type CSSProperties, styles } from '../../../../style';
import { AlignedText } from '../../../common/AlignedText';
@@ -13,7 +13,7 @@ import { View } from '../../../common/View';
import { PrivacyFilter } from '../../../PrivacyFilter';
import { useFormat } from '../../../spreadsheet/useFormat';
import { makeAmountFullStyle } from '../../util';
-import { useReportSheetValue } from '../ReportComponents';
+import { useTrackingSheetValue } from '../TrackingBudgetComponents';
type SavedProps = {
projected: boolean;
@@ -22,8 +22,8 @@ type SavedProps = {
export function Saved({ projected, style }: SavedProps) {
const { t } = useTranslation();
const budgetedSaved =
- useReportSheetValue(reportBudget.totalBudgetedSaved) || 0;
- const totalSaved = useReportSheetValue(reportBudget.totalSaved) || 0;
+ useTrackingSheetValue(trackingBudget.totalBudgetedSaved) || 0;
+ const totalSaved = useTrackingSheetValue(trackingBudget.totalSaved) || 0;
const format = useFormat();
const saved = projected ? budgetedSaved : totalSaved;
const isNegative = saved < 0;
diff --git a/packages/desktop-client/src/components/budget/report/budgetsummary/fraction.ts b/packages/desktop-client/src/components/budget/tracking/budgetsummary/fraction.ts
similarity index 100%
rename from packages/desktop-client/src/components/budget/report/budgetsummary/fraction.ts
rename to packages/desktop-client/src/components/budget/tracking/budgetsummary/fraction.ts
diff --git a/packages/desktop-client/src/components/budget/util.ts b/packages/desktop-client/src/components/budget/util.ts
index 31472c9806..342877ccc9 100644
--- a/packages/desktop-client/src/components/budget/util.ts
+++ b/packages/desktop-client/src/components/budget/util.ts
@@ -166,7 +166,7 @@ export async function prewarmMonth(
month: string,
) {
const method: keyof Handlers =
- budgetType === 'report' ? 'report-budget-month' : 'rollover-budget-month';
+ budgetType === 'report' ? 'tracking-budget-month' : 'envelope-budget-month';
const values = await send(method, { month });
diff --git a/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx b/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx
index c9f1ad4b29..6c48175dfb 100644
--- a/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx
+++ b/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx
@@ -7,7 +7,7 @@ import memoizeOne from 'memoize-one';
import { collapseModals, pushModal } from 'loot-core/client/actions';
import { groupById, integerToCurrency } from 'loot-core/shared/util';
-import { rolloverBudget, reportBudget } from 'loot-core/src/client/queries';
+import { envelopeBudget, trackingBudget } from 'loot-core/src/client/queries';
import * as monthUtils from 'loot-core/src/shared/months';
import { useCategories } from '../../../hooks/useCategories';
@@ -124,8 +124,8 @@ function ToBudget({ toBudget, onPress, show3Cols }) {
function Saved({ projected, onPress, show3Cols }) {
const binding = projected
- ? reportBudget.totalBudgetedSaved
- : reportBudget.totalSaved;
+ ? trackingBudget.totalBudgetedSaved
+ : trackingBudget.totalSaved;
const saved = useSheetValue(binding) || 0;
const format = useFormat();
@@ -404,8 +404,8 @@ const ExpenseCategory = memo(function ExpenseCategory({
const catBalance = useSheetValue(
type === 'rollover'
- ? rolloverBudget.catBalance(category.id)
- : reportBudget.catBalance(category.id),
+ ? envelopeBudget.catBalance(category.id)
+ : trackingBudget.catBalance(category.id),
);
const budgetedtmp = useSheetValue(budgeted);
const balancetmp = useSheetValue(balance);
@@ -1285,18 +1285,18 @@ const ExpenseGroup = memo(function ExpenseGroup({
showBudgetedCol={showBudgetedCol}
budgeted={
type === 'report'
- ? reportBudget.groupBudgeted(group.id)
- : rolloverBudget.groupBudgeted(group.id)
+ ? trackingBudget.groupBudgeted(group.id)
+ : envelopeBudget.groupBudgeted(group.id)
}
spent={
type === 'report'
- ? reportBudget.groupSumAmount(group.id)
- : rolloverBudget.groupSumAmount(group.id)
+ ? trackingBudget.groupSumAmount(group.id)
+ : envelopeBudget.groupSumAmount(group.id)
}
balance={
type === 'report'
- ? reportBudget.groupBalance(group.id)
- : rolloverBudget.groupBalance(group.id)
+ ? trackingBudget.groupBalance(group.id)
+ : envelopeBudget.groupBalance(group.id)
}
show3Cols={show3Cols}
editMode={editMode}
@@ -1322,33 +1322,33 @@ const ExpenseGroup = memo(function ExpenseGroup({
isHidden={!!category.hidden || group.hidden}
goal={
type === 'report'
- ? reportBudget.catGoal(category.id)
- : rolloverBudget.catGoal(category.id)
+ ? trackingBudget.catGoal(category.id)
+ : envelopeBudget.catGoal(category.id)
}
longGoal={
type === 'report'
- ? reportBudget.catLongGoal(category.id)
- : rolloverBudget.catLongGoal(category.id)
+ ? trackingBudget.catLongGoal(category.id)
+ : envelopeBudget.catLongGoal(category.id)
}
budgeted={
type === 'report'
- ? reportBudget.catBudgeted(category.id)
- : rolloverBudget.catBudgeted(category.id)
+ ? trackingBudget.catBudgeted(category.id)
+ : envelopeBudget.catBudgeted(category.id)
}
spent={
type === 'report'
- ? reportBudget.catSumAmount(category.id)
- : rolloverBudget.catSumAmount(category.id)
+ ? trackingBudget.catSumAmount(category.id)
+ : envelopeBudget.catSumAmount(category.id)
}
balance={
type === 'report'
- ? reportBudget.catBalance(category.id)
- : rolloverBudget.catBalance(category.id)
+ ? trackingBudget.catBalance(category.id)
+ : envelopeBudget.catBalance(category.id)
}
carryover={
type === 'report'
- ? reportBudget.catCarryover(category.id)
- : rolloverBudget.catCarryover(category.id)
+ ? trackingBudget.catCarryover(category.id)
+ : envelopeBudget.catCarryover(category.id)
}
style={{
backgroundColor: theme.tableBackground,
@@ -1403,12 +1403,12 @@ function IncomeGroup({
<IncomeGroupHeader
group={group}
budgeted={
- type === 'report' ? reportBudget.groupBudgeted(group.id) : null
+ type === 'report' ? trackingBudget.groupBudgeted(group.id) : null
}
balance={
type === 'report'
- ? reportBudget.groupSumAmount(group.id)
- : rolloverBudget.groupSumAmount(group.id)
+ ? trackingBudget.groupSumAmount(group.id)
+ : envelopeBudget.groupSumAmount(group.id)
}
onAddCategory={onAddCategory}
editMode={editMode}
@@ -1432,13 +1432,13 @@ function IncomeGroup({
type={type}
budgeted={
type === 'report'
- ? reportBudget.catBudgeted(category.id)
+ ? trackingBudget.catBudgeted(category.id)
: null
}
balance={
type === 'report'
- ? reportBudget.catSumAmount(category.id)
- : rolloverBudget.catSumAmount(category.id)
+ ? trackingBudget.catSumAmount(category.id)
+ : envelopeBudget.catSumAmount(category.id)
}
style={{
backgroundColor: theme.tableBackground,
@@ -1722,7 +1722,7 @@ function BudgetTableHeader({
/>
) : (
<ToBudget
- toBudget={rolloverBudget.toBudget}
+ toBudget={envelopeBudget.toBudget}
onPress={onShowBudgetSummary}
show3Cols={show3Cols}
/>
@@ -1739,8 +1739,8 @@ function BudgetTableHeader({
<CellValue
binding={
type === 'report'
- ? reportBudget.totalBudgetedExpense
- : rolloverBudget.totalBudgeted
+ ? trackingBudget.totalBudgetedExpense
+ : envelopeBudget.totalBudgeted
}
type="financial"
>
@@ -1798,8 +1798,8 @@ function BudgetTableHeader({
<CellValue
binding={
type === 'report'
- ? reportBudget.totalSpent
- : rolloverBudget.totalSpent
+ ? trackingBudget.totalSpent
+ : envelopeBudget.totalSpent
}
type="financial"
>
@@ -1856,8 +1856,8 @@ function BudgetTableHeader({
<CellValue
binding={
type === 'report'
- ? reportBudget.totalLeftover
- : rolloverBudget.totalBalance
+ ? trackingBudget.totalLeftover
+ : envelopeBudget.totalBalance
}
type="financial"
>
diff --git a/packages/desktop-client/src/components/mobile/budget/index.tsx b/packages/desktop-client/src/components/mobile/budget/index.tsx
index ebb6062384..11ccb144b0 100644
--- a/packages/desktop-client/src/components/mobile/budget/index.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/index.tsx
@@ -97,13 +97,13 @@ export function Budget() {
const onShowBudgetSummary = useCallback(() => {
if (budgetType === 'report') {
dispatch(
- pushModal('report-budget-summary', {
+ pushModal('tracking-budget-summary', {
month: startMonth,
}),
);
} else {
dispatch(
- pushModal('rollover-budget-summary', {
+ pushModal('envelope-budget-summary', {
month: startMonth,
onBudgetAction,
}),
@@ -446,11 +446,14 @@ export function Budget() {
const onOpenBudgetMonthMenu = useCallback(
month => {
dispatch(
- pushModal(`${budgetType}-budget-month-menu`, {
- month,
- onBudgetAction,
- onEditNotes: onOpenBudgetMonthNotesModal,
- }),
+ pushModal(
+ `${budgetType === 'report' ? 'tracking' : 'envelope'}-budget-month-menu`,
+ {
+ month,
+ onBudgetAction,
+ onEditNotes: onOpenBudgetMonthNotesModal,
+ },
+ ),
);
},
[budgetType, dispatch, onBudgetAction, onOpenBudgetMonthNotesModal],
diff --git a/packages/desktop-client/src/components/modals/RolloverBalanceMenuModal.tsx b/packages/desktop-client/src/components/modals/EnvelopeBalanceMenuModal.tsx
similarity index 79%
rename from packages/desktop-client/src/components/modals/RolloverBalanceMenuModal.tsx
rename to packages/desktop-client/src/components/modals/EnvelopeBalanceMenuModal.tsx
index 1bb11b0ce8..fdaa827bf3 100644
--- a/packages/desktop-client/src/components/modals/RolloverBalanceMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/EnvelopeBalanceMenuModal.tsx
@@ -1,6 +1,6 @@
import React, { type ComponentPropsWithoutRef } from 'react';
-import { rolloverBudget } from 'loot-core/client/queries';
+import { envelopeBudget } from 'loot-core/client/queries';
import { useCategory } from '../../hooks/useCategory';
import { type CSSProperties, theme, styles } from '../../style';
@@ -8,7 +8,7 @@ import {
BalanceWithCarryover,
CarryoverIndicator,
} from '../budget/BalanceWithCarryover';
-import { BalanceMenu } from '../budget/rollover/BalanceMenu';
+import { BalanceMenu } from '../budget/envelope/BalanceMenu';
import {
Modal,
ModalCloseButton,
@@ -19,16 +19,16 @@ import { Text } from '../common/Text';
import { View } from '../common/View';
import { CellValueText } from '../spreadsheet/CellValue';
-type RolloverBalanceMenuModalProps = ComponentPropsWithoutRef<
+type EnvelopeBalanceMenuModalProps = ComponentPropsWithoutRef<
typeof BalanceMenu
>;
-export function RolloverBalanceMenuModal({
+export function EnvelopeBalanceMenuModal({
categoryId,
onCarryover,
onTransfer,
onCover,
-}: RolloverBalanceMenuModalProps) {
+}: EnvelopeBalanceMenuModalProps) {
const defaultMenuItemStyle: CSSProperties = {
...styles.mobileMenuItem,
color: theme.menuItemText,
@@ -43,7 +43,7 @@ export function RolloverBalanceMenuModal({
}
return (
- <Modal name="rollover-balance-menu">
+ <Modal name="envelope-balance-menu">
{({ state: { close } }) => (
<>
<ModalHeader
@@ -67,11 +67,11 @@ export function RolloverBalanceMenuModal({
</Text>
<BalanceWithCarryover
disabled
- carryover={rolloverBudget.catCarryover(categoryId)}
- balance={rolloverBudget.catBalance(categoryId)}
- goal={rolloverBudget.catGoal(categoryId)}
- budgeted={rolloverBudget.catBudgeted(categoryId)}
- longGoal={rolloverBudget.catLongGoal(categoryId)}
+ carryover={envelopeBudget.catCarryover(categoryId)}
+ balance={envelopeBudget.catBalance(categoryId)}
+ goal={envelopeBudget.catGoal(categoryId)}
+ budgeted={envelopeBudget.catBudgeted(categoryId)}
+ longGoal={envelopeBudget.catLongGoal(categoryId)}
CarryoverIndicator={({ style }) => (
<CarryoverIndicator
style={{
diff --git a/packages/desktop-client/src/components/modals/RolloverBudgetMenuModal.tsx b/packages/desktop-client/src/components/modals/EnvelopeBudgetMenuModal.tsx
similarity index 85%
rename from packages/desktop-client/src/components/modals/RolloverBudgetMenuModal.tsx
rename to packages/desktop-client/src/components/modals/EnvelopeBudgetMenuModal.tsx
index 33845028fa..f450a6f6bd 100644
--- a/packages/desktop-client/src/components/modals/RolloverBudgetMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/EnvelopeBudgetMenuModal.tsx
@@ -4,13 +4,13 @@ import React, {
useEffect,
} from 'react';
-import { rolloverBudget } from 'loot-core/client/queries';
+import { envelopeBudget } from 'loot-core/client/queries';
import { amountToInteger, integerToAmount } from 'loot-core/shared/util';
import { useCategory } from '../../hooks/useCategory';
import { type CSSProperties, theme, styles } from '../../style';
-import { BudgetMenu } from '../budget/rollover/BudgetMenu';
-import { useRolloverSheetValue } from '../budget/rollover/RolloverComponents';
+import { BudgetMenu } from '../budget/envelope/BudgetMenu';
+import { useEnvelopeSheetValue } from '../budget/envelope/EnvelopeBudgetComponents';
import {
Modal,
ModalCloseButton,
@@ -21,20 +21,20 @@ import { Text } from '../common/Text';
import { View } from '../common/View';
import { FocusableAmountInput } from '../mobile/transactions/FocusableAmountInput';
-type RolloverBudgetMenuModalProps = ComponentPropsWithoutRef<
+type EnvelopeBudgetMenuModalProps = ComponentPropsWithoutRef<
typeof BudgetMenu
> & {
categoryId: string;
onUpdateBudget: (amount: number) => void;
};
-export function RolloverBudgetMenuModal({
+export function EnvelopeBudgetMenuModal({
categoryId,
onUpdateBudget,
onCopyLastMonthAverage,
onSetMonthsAverage,
onApplyBudgetTemplate,
-}: RolloverBudgetMenuModalProps) {
+}: EnvelopeBudgetMenuModalProps) {
const defaultMenuItemStyle: CSSProperties = {
...styles.mobileMenuItem,
color: theme.menuItemText,
@@ -42,8 +42,8 @@ export function RolloverBudgetMenuModal({
borderTop: `1px solid ${theme.pillBorder}`,
};
- const budgeted = useRolloverSheetValue(
- rolloverBudget.catBudgeted(categoryId),
+ const budgeted = useEnvelopeSheetValue(
+ envelopeBudget.catBudgeted(categoryId),
);
const category = useCategory(categoryId);
const [amountFocused, setAmountFocused] = useState(false);
@@ -61,7 +61,7 @@ export function RolloverBudgetMenuModal({
}
return (
- <Modal name="rollover-budget-menu">
+ <Modal name="envelope-budget-menu">
{({ state: { close } }) => (
<>
<ModalHeader
diff --git a/packages/desktop-client/src/components/modals/RolloverBudgetMonthMenuModal.tsx b/packages/desktop-client/src/components/modals/EnvelopeBudgetMonthMenuModal.tsx
similarity index 96%
rename from packages/desktop-client/src/components/modals/RolloverBudgetMonthMenuModal.tsx
rename to packages/desktop-client/src/components/modals/EnvelopeBudgetMonthMenuModal.tsx
index c35ea9ab57..6f5774025a 100644
--- a/packages/desktop-client/src/components/modals/RolloverBudgetMonthMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/EnvelopeBudgetMonthMenuModal.tsx
@@ -10,23 +10,23 @@ import { useUndo } from '../../hooks/useUndo';
import { SvgCheveronDown, SvgCheveronUp } from '../../icons/v1';
import { SvgNotesPaper } from '../../icons/v2';
import { type CSSProperties, styles, theme } from '../../style';
-import { BudgetMonthMenu } from '../budget/rollover/budgetsummary/BudgetMonthMenu';
+import { BudgetMonthMenu } from '../budget/envelope/budgetsummary/BudgetMonthMenu';
import { Button } from '../common/Button2';
import { Modal, ModalCloseButton, ModalHeader } from '../common/Modal';
import { View } from '../common/View';
import { Notes } from '../Notes';
-type RolloverBudgetMonthMenuModalProps = {
+type EnvelopeBudgetMonthMenuModalProps = {
month: string;
onBudgetAction: (month: string, action: string, arg?: unknown) => void;
onEditNotes: (month: string) => void;
};
-export function RolloverBudgetMonthMenuModal({
+export function EnvelopeBudgetMonthMenuModal({
month,
onBudgetAction,
onEditNotes,
-}: RolloverBudgetMonthMenuModalProps) {
+}: EnvelopeBudgetMonthMenuModalProps) {
const originalNotes = useNotes(`budget-${month}`);
const { showUndoNotification } = useUndo();
@@ -59,7 +59,7 @@ export function RolloverBudgetMonthMenuModal({
return (
<Modal
- name="rollover-budget-month-menu"
+ name="envelope-budget-month-menu"
containerProps={{
style: { height: '50vh' },
}}
diff --git a/packages/desktop-client/src/components/modals/RolloverBudgetSummaryModal.tsx b/packages/desktop-client/src/components/modals/EnvelopeBudgetSummaryModal.tsx
similarity index 86%
rename from packages/desktop-client/src/components/modals/RolloverBudgetSummaryModal.tsx
rename to packages/desktop-client/src/components/modals/EnvelopeBudgetSummaryModal.tsx
index a25478616a..aad37cb675 100644
--- a/packages/desktop-client/src/components/modals/RolloverBudgetSummaryModal.tsx
+++ b/packages/desktop-client/src/components/modals/EnvelopeBudgetSummaryModal.tsx
@@ -2,33 +2,33 @@ import React from 'react';
import { useDispatch } from 'react-redux';
import { collapseModals, pushModal } from 'loot-core/client/actions';
-import { rolloverBudget } from 'loot-core/client/queries';
+import { envelopeBudget } from 'loot-core/client/queries';
import { groupById, integerToCurrency } from 'loot-core/shared/util';
import { format, sheetForMonth, prevMonth } from 'loot-core/src/shared/months';
import { useCategories } from '../../hooks/useCategories';
import { useUndo } from '../../hooks/useUndo';
import { styles } from '../../style';
-import { ToBudgetAmount } from '../budget/rollover/budgetsummary/ToBudgetAmount';
-import { TotalsList } from '../budget/rollover/budgetsummary/TotalsList';
-import { useRolloverSheetValue } from '../budget/rollover/RolloverComponents';
+import { ToBudgetAmount } from '../budget/envelope/budgetsummary/ToBudgetAmount';
+import { TotalsList } from '../budget/envelope/budgetsummary/TotalsList';
+import { useEnvelopeSheetValue } from '../budget/envelope/EnvelopeBudgetComponents';
import { Modal, ModalCloseButton, ModalHeader } from '../common/Modal';
import { NamespaceContext } from '../spreadsheet/NamespaceContext';
-type RolloverBudgetSummaryModalProps = {
+type EnvelopeBudgetSummaryModalProps = {
onBudgetAction: (month: string, action: string, arg?: unknown) => void;
month: string;
};
-export function RolloverBudgetSummaryModal({
+export function EnvelopeBudgetSummaryModal({
month,
onBudgetAction,
-}: RolloverBudgetSummaryModalProps) {
+}: EnvelopeBudgetSummaryModalProps) {
const dispatch = useDispatch();
const prevMonthName = format(prevMonth(month), 'MMM');
const sheetValue =
- useRolloverSheetValue({
- name: rolloverBudget.toBudget,
+ useEnvelopeSheetValue({
+ name: envelopeBudget.toBudget,
value: 0,
}) ?? 0;
@@ -94,7 +94,7 @@ export function RolloverBudgetSummaryModal({
const onClick = ({ close }: { close: () => void }) => {
dispatch(
- pushModal('rollover-summary-to-budget-menu', {
+ pushModal('envelope-summary-to-budget-menu', {
month,
onTransfer: openTransferAvailableModal,
onCover: openCoverOverbudgetedModal,
@@ -108,7 +108,7 @@ export function RolloverBudgetSummaryModal({
};
return (
- <Modal name="rollover-budget-summary">
+ <Modal name="envelope-budget-summary">
{({ state: { close } }) => (
<>
<ModalHeader
diff --git a/packages/desktop-client/src/components/modals/RolloverToBudgetMenuModal.tsx b/packages/desktop-client/src/components/modals/EnvelopeToBudgetMenuModal.tsx
similarity index 78%
rename from packages/desktop-client/src/components/modals/RolloverToBudgetMenuModal.tsx
rename to packages/desktop-client/src/components/modals/EnvelopeToBudgetMenuModal.tsx
index 1177a65aa9..d56ab003a1 100644
--- a/packages/desktop-client/src/components/modals/RolloverToBudgetMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/EnvelopeToBudgetMenuModal.tsx
@@ -1,19 +1,19 @@
import React, { type ComponentPropsWithoutRef } from 'react';
import { type CSSProperties, theme, styles } from '../../style';
-import { ToBudgetMenu } from '../budget/rollover/budgetsummary/ToBudgetMenu';
+import { ToBudgetMenu } from '../budget/envelope/budgetsummary/ToBudgetMenu';
import { Modal, ModalCloseButton, ModalHeader } from '../common/Modal';
-type RolloverToBudgetMenuModalProps = ComponentPropsWithoutRef<
+type EnvelopeToBudgetMenuModalProps = ComponentPropsWithoutRef<
typeof ToBudgetMenu
>;
-export function RolloverToBudgetMenuModal({
+export function EnvelopeToBudgetMenuModal({
onTransfer,
onCover,
onHoldBuffer,
onResetHoldBuffer,
-}: RolloverToBudgetMenuModalProps) {
+}: EnvelopeToBudgetMenuModalProps) {
const defaultMenuItemStyle: CSSProperties = {
...styles.mobileMenuItem,
color: theme.menuItemText,
@@ -22,7 +22,7 @@ export function RolloverToBudgetMenuModal({
};
return (
- <Modal name="rollover-summary-to-budget-menu">
+ <Modal name="envelope-summary-to-budget-menu">
{({ state: { close } }) => (
<>
<ModalHeader
diff --git a/packages/desktop-client/src/components/modals/HoldBufferModal.tsx b/packages/desktop-client/src/components/modals/HoldBufferModal.tsx
index 61011b1837..9006780ab0 100644
--- a/packages/desktop-client/src/components/modals/HoldBufferModal.tsx
+++ b/packages/desktop-client/src/components/modals/HoldBufferModal.tsx
@@ -1,9 +1,9 @@
import React, { useState } from 'react';
-import { rolloverBudget } from 'loot-core/client/queries';
+import { envelopeBudget } from 'loot-core/client/queries';
import { styles } from '../../style';
-import { useRolloverSheetValue } from '../budget/rollover/RolloverComponents';
+import { useEnvelopeSheetValue } from '../budget/envelope/EnvelopeBudgetComponents';
import { Button } from '../common/Button2';
import { InitialFocus } from '../common/InitialFocus';
import { Modal, ModalCloseButton, ModalHeader } from '../common/Modal';
@@ -17,7 +17,7 @@ type HoldBufferModalProps = {
};
export function HoldBufferModal({ onSubmit }: HoldBufferModalProps) {
- const available = useRolloverSheetValue(rolloverBudget.toBudget) ?? 0;
+ const available = useEnvelopeSheetValue(envelopeBudget.toBudget) ?? 0;
const [amount, setAmount] = useState<number>(0);
const _onSubmit = (newAmount: number) => {
diff --git a/packages/desktop-client/src/components/modals/ReportBalanceMenuModal.tsx b/packages/desktop-client/src/components/modals/TrackingBalanceMenuModal.tsx
similarity index 78%
rename from packages/desktop-client/src/components/modals/ReportBalanceMenuModal.tsx
rename to packages/desktop-client/src/components/modals/TrackingBalanceMenuModal.tsx
index a22cecc22a..3850eaa4c5 100644
--- a/packages/desktop-client/src/components/modals/ReportBalanceMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/TrackingBalanceMenuModal.tsx
@@ -1,6 +1,6 @@
import React, { type ComponentPropsWithoutRef } from 'react';
-import { reportBudget } from 'loot-core/client/queries';
+import { trackingBudget } from 'loot-core/client/queries';
import { useCategory } from '../../hooks/useCategory';
import { type CSSProperties, theme, styles } from '../../style';
@@ -8,7 +8,7 @@ import {
BalanceWithCarryover,
CarryoverIndicator,
} from '../budget/BalanceWithCarryover';
-import { BalanceMenu } from '../budget/report/BalanceMenu';
+import { BalanceMenu } from '../budget/tracking/BalanceMenu';
import {
Modal,
ModalCloseButton,
@@ -19,12 +19,14 @@ import { Text } from '../common/Text';
import { View } from '../common/View';
import { CellValueText } from '../spreadsheet/CellValue';
-type ReportBalanceMenuModalProps = ComponentPropsWithoutRef<typeof BalanceMenu>;
+type TrackingBalanceMenuModalProps = ComponentPropsWithoutRef<
+ typeof BalanceMenu
+>;
-export function ReportBalanceMenuModal({
+export function TrackingBalanceMenuModal({
categoryId,
onCarryover,
-}: ReportBalanceMenuModalProps) {
+}: TrackingBalanceMenuModalProps) {
const defaultMenuItemStyle: CSSProperties = {
...styles.mobileMenuItem,
color: theme.menuItemText,
@@ -39,7 +41,7 @@ export function ReportBalanceMenuModal({
}
return (
- <Modal name="report-balance-menu">
+ <Modal name="tracking-balance-menu">
{({ state: { close } }) => (
<>
<ModalHeader
@@ -63,11 +65,11 @@ export function ReportBalanceMenuModal({
</Text>
<BalanceWithCarryover
disabled
- carryover={reportBudget.catCarryover(categoryId)}
- balance={reportBudget.catBalance(categoryId)}
- goal={reportBudget.catGoal(categoryId)}
- budgeted={reportBudget.catBudgeted(categoryId)}
- longGoal={reportBudget.catLongGoal(categoryId)}
+ carryover={trackingBudget.catCarryover(categoryId)}
+ balance={trackingBudget.catBalance(categoryId)}
+ goal={trackingBudget.catGoal(categoryId)}
+ budgeted={trackingBudget.catBudgeted(categoryId)}
+ longGoal={trackingBudget.catLongGoal(categoryId)}
CarryoverIndicator={({ style }) => (
<CarryoverIndicator
style={{
diff --git a/packages/desktop-client/src/components/modals/ReportBudgetMenuModal.tsx b/packages/desktop-client/src/components/modals/TrackingBudgetMenuModal.tsx
similarity index 85%
rename from packages/desktop-client/src/components/modals/ReportBudgetMenuModal.tsx
rename to packages/desktop-client/src/components/modals/TrackingBudgetMenuModal.tsx
index 7ea6ea551f..3f899c9ed2 100644
--- a/packages/desktop-client/src/components/modals/ReportBudgetMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/TrackingBudgetMenuModal.tsx
@@ -4,13 +4,13 @@ import React, {
useEffect,
} from 'react';
-import { reportBudget } from 'loot-core/client/queries';
+import { trackingBudget } from 'loot-core/client/queries';
import { amountToInteger, integerToAmount } from 'loot-core/shared/util';
import { useCategory } from '../../hooks/useCategory';
import { type CSSProperties, theme, styles } from '../../style';
-import { BudgetMenu } from '../budget/report/BudgetMenu';
-import { useReportSheetValue } from '../budget/report/ReportComponents';
+import { BudgetMenu } from '../budget/tracking/BudgetMenu';
+import { useTrackingSheetValue } from '../budget/tracking/TrackingBudgetComponents';
import {
Modal,
ModalCloseButton,
@@ -21,20 +21,20 @@ import { Text } from '../common/Text';
import { View } from '../common/View';
import { FocusableAmountInput } from '../mobile/transactions/FocusableAmountInput';
-type ReportBudgetMenuModalProps = ComponentPropsWithoutRef<
+type TrackingBudgetMenuModalProps = ComponentPropsWithoutRef<
typeof BudgetMenu
> & {
categoryId: string;
onUpdateBudget: (amount: number) => void;
};
-export function ReportBudgetMenuModal({
+export function TrackingBudgetMenuModal({
categoryId,
onUpdateBudget,
onCopyLastMonthAverage,
onSetMonthsAverage,
onApplyBudgetTemplate,
-}: ReportBudgetMenuModalProps) {
+}: TrackingBudgetMenuModalProps) {
const defaultMenuItemStyle: CSSProperties = {
...styles.mobileMenuItem,
color: theme.menuItemText,
@@ -42,7 +42,9 @@ export function ReportBudgetMenuModal({
borderTop: `1px solid ${theme.pillBorder}`,
};
- const budgeted = useReportSheetValue(reportBudget.catBudgeted(categoryId));
+ const budgeted = useTrackingSheetValue(
+ trackingBudget.catBudgeted(categoryId),
+ );
const category = useCategory(categoryId);
const [amountFocused, setAmountFocused] = useState(false);
@@ -59,7 +61,7 @@ export function ReportBudgetMenuModal({
}
return (
- <Modal name="report-budget-menu">
+ <Modal name="tracking-budget-menu">
{({ state: { close } }) => (
<>
<ModalHeader
diff --git a/packages/desktop-client/src/components/modals/ReportBudgetMonthMenuModal.tsx b/packages/desktop-client/src/components/modals/TrackingBudgetMonthMenuModal.tsx
similarity index 96%
rename from packages/desktop-client/src/components/modals/ReportBudgetMonthMenuModal.tsx
rename to packages/desktop-client/src/components/modals/TrackingBudgetMonthMenuModal.tsx
index 9ee19db945..a3025428ed 100644
--- a/packages/desktop-client/src/components/modals/ReportBudgetMonthMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/TrackingBudgetMonthMenuModal.tsx
@@ -10,23 +10,23 @@ import { useUndo } from '../../hooks/useUndo';
import { SvgCheveronDown, SvgCheveronUp } from '../../icons/v1';
import { SvgNotesPaper } from '../../icons/v2';
import { type CSSProperties, styles, theme } from '../../style';
-import { BudgetMonthMenu } from '../budget/report/budgetsummary/BudgetMonthMenu';
+import { BudgetMonthMenu } from '../budget/tracking/budgetsummary/BudgetMonthMenu';
import { Button } from '../common/Button2';
import { Modal, ModalCloseButton, ModalHeader } from '../common/Modal';
import { View } from '../common/View';
import { Notes } from '../Notes';
-type ReportBudgetMonthMenuModalProps = {
+type TrackingBudgetMonthMenuModalProps = {
month: string;
onBudgetAction: (month: string, action: string, arg?: unknown) => void;
onEditNotes: (month: string) => void;
};
-export function ReportBudgetMonthMenuModal({
+export function TrackingBudgetMonthMenuModal({
month,
onBudgetAction,
onEditNotes,
-}: ReportBudgetMonthMenuModalProps) {
+}: TrackingBudgetMonthMenuModalProps) {
const originalNotes = useNotes(`budget-${month}`);
const { showUndoNotification } = useUndo();
@@ -59,7 +59,7 @@ export function ReportBudgetMonthMenuModal({
return (
<Modal
- name="report-budget-month-menu"
+ name="tracking-budget-month-menu"
containerProps={{
style: { height: '50vh' },
}}
diff --git a/packages/desktop-client/src/components/modals/ReportBudgetSummaryModal.tsx b/packages/desktop-client/src/components/modals/TrackingBudgetSummaryModal.tsx
similarity index 77%
rename from packages/desktop-client/src/components/modals/ReportBudgetSummaryModal.tsx
rename to packages/desktop-client/src/components/modals/TrackingBudgetSummaryModal.tsx
index 99ea5d1f4d..fe07c1b8c0 100644
--- a/packages/desktop-client/src/components/modals/ReportBudgetSummaryModal.tsx
+++ b/packages/desktop-client/src/components/modals/TrackingBudgetSummaryModal.tsx
@@ -4,23 +4,23 @@ import { sheetForMonth } from 'loot-core/src/shared/months';
import * as monthUtils from 'loot-core/src/shared/months';
import { styles } from '../../style';
-import { ExpenseTotal } from '../budget/report/budgetsummary/ExpenseTotal';
-import { IncomeTotal } from '../budget/report/budgetsummary/IncomeTotal';
-import { Saved } from '../budget/report/budgetsummary/Saved';
+import { ExpenseTotal } from '../budget/tracking/budgetsummary/ExpenseTotal';
+import { IncomeTotal } from '../budget/tracking/budgetsummary/IncomeTotal';
+import { Saved } from '../budget/tracking/budgetsummary/Saved';
import { Modal, ModalCloseButton, ModalHeader } from '../common/Modal';
import { Stack } from '../common/Stack';
import { NamespaceContext } from '../spreadsheet/NamespaceContext';
-type ReportBudgetSummaryModalProps = {
+type TrackingBudgetSummaryModalProps = {
month: string;
};
-export function ReportBudgetSummaryModal({
+export function TrackingBudgetSummaryModal({
month,
-}: ReportBudgetSummaryModalProps) {
+}: TrackingBudgetSummaryModalProps) {
const currentMonth = monthUtils.currentMonth();
return (
- <Modal name="report-budget-summary">
+ <Modal name="tracking-budget-summary">
{({ state: { close } }) => (
<>
<ModalHeader
diff --git a/packages/desktop-client/src/components/settings/BudgetTypeSettings.tsx b/packages/desktop-client/src/components/settings/BudgetTypeSettings.tsx
index c66463cec0..c14aeb91ea 100644
--- a/packages/desktop-client/src/components/settings/BudgetTypeSettings.tsx
+++ b/packages/desktop-client/src/components/settings/BudgetTypeSettings.tsx
@@ -44,7 +44,7 @@ export function BudgetTypeSettings() {
relying on current available funds.{' '}
<Link
variant="external"
- to="https://actualbudget.org/docs/experimental/report-budget"
+ to="https://actualbudget.org/docs/experimental/tracking-budget"
linkColor="purple"
>
Learn more…
diff --git a/packages/desktop-client/src/components/settings/Experimental.tsx b/packages/desktop-client/src/components/settings/Experimental.tsx
index 6763cc340f..1c73f86261 100644
--- a/packages/desktop-client/src/components/settings/Experimental.tsx
+++ b/packages/desktop-client/src/components/settings/Experimental.tsx
@@ -67,7 +67,7 @@ function FeatureToggle({
);
}
-function ReportBudgetFeature() {
+function TrackingBudgetFeature() {
const { t } = useTranslation();
const [budgetType = 'rollover'] = useSyncedPref('budgetType');
const enabled = useFeatureFlag('reportBudget');
@@ -76,7 +76,7 @@ function ReportBudgetFeature() {
<FeatureToggle
flag="reportBudget"
disableToggle={blockToggleOff}
- error={t('Switch to a rollover budget before turning off this feature')}
+ error={t('Switch to a envelope budget before turning off this feature')}
feedbackLink="https://github.com/actualbudget/actual/issues/2999"
>
<Trans>Budget mode toggle</Trans>
@@ -99,7 +99,7 @@ export function ExperimentalFeatures() {
<Trans>Monthly spending report</Trans>
</FeatureToggle>
- <ReportBudgetFeature />
+ <TrackingBudgetFeature />
<FeatureToggle flag="goalTemplatesEnabled">
<Trans>Goal templates</Trans>
diff --git a/packages/desktop-client/src/components/spreadsheet/index.ts b/packages/desktop-client/src/components/spreadsheet/index.ts
index 38b6b27afe..2cc4dc51f3 100644
--- a/packages/desktop-client/src/components/spreadsheet/index.ts
+++ b/packages/desktop-client/src/components/spreadsheet/index.ts
@@ -15,12 +15,12 @@ export type Spreadsheets = {
balanceCleared: number;
balanceUncleared: number;
};
- 'rollover-budget': {
+ 'envelope-budget': {
// Common fields
'uncategorized-amount': number;
'uncategorized-balance': number;
- // Rollover fields
+ // Envelope budget fields
'available-funds': number;
'last-month-overspent': number;
buffered: number;
@@ -40,12 +40,12 @@ export type Spreadsheets = {
goal: number;
'long-goal': number;
};
- 'report-budget': {
+ 'tracking-budget': {
// Common fields
'uncategorized-amount': number;
'uncategorized-balance': number;
- // Report fields
+ // Tracking budget fields
'total-budgeted': number;
'total-budget-income': number;
'total-saved': number;
diff --git a/packages/loot-core/src/client/queries.ts b/packages/loot-core/src/client/queries.ts
index 590e5e9a68..ab8a45bed2 100644
--- a/packages/loot-core/src/client/queries.ts
+++ b/packages/loot-core/src/client/queries.ts
@@ -25,8 +25,8 @@ type BudgetType<SheetName extends SheetNames> = Record<
>;
const accountParametrizedField = parametrizedField<'account'>();
-const rolloverParametrizedField = parametrizedField<'rollover-budget'>();
-const reportParametrizedField = parametrizedField<'report-budget'>();
+const envelopeParametrizedField = parametrizedField<'envelope-budget'>();
+const trackingParametrizedField = parametrizedField<'tracking-budget'>();
export function getAccountFilter(accountId?: string, field = 'account') {
if (accountId) {
@@ -244,7 +244,7 @@ export function uncategorizedCount<SheetName extends SheetNames>() {
} satisfies Binding<SheetName, 'uncategorized-amount'>;
}
-export const rolloverBudget = {
+export const envelopeBudget = {
incomeAvailable: 'available-funds',
lastMonthOverspent: 'last-month-overspent',
forNextMonth: 'buffered',
@@ -256,21 +256,21 @@ export const rolloverBudget = {
totalSpent: 'total-spent',
totalBalance: 'total-leftover',
- groupSumAmount: rolloverParametrizedField('group-sum-amount'),
+ groupSumAmount: envelopeParametrizedField('group-sum-amount'),
groupIncomeReceived: 'total-income',
- groupBudgeted: rolloverParametrizedField('group-budget'),
- groupBalance: rolloverParametrizedField('group-leftover'),
+ groupBudgeted: envelopeParametrizedField('group-budget'),
+ groupBalance: envelopeParametrizedField('group-leftover'),
- catBudgeted: rolloverParametrizedField('budget'),
- catSumAmount: rolloverParametrizedField('sum-amount'),
- catBalance: rolloverParametrizedField('leftover'),
- catCarryover: rolloverParametrizedField('carryover'),
- catGoal: rolloverParametrizedField('goal'),
- catLongGoal: rolloverParametrizedField('long-goal'),
-} satisfies BudgetType<'rollover-budget'>;
+ catBudgeted: envelopeParametrizedField('budget'),
+ catSumAmount: envelopeParametrizedField('sum-amount'),
+ catBalance: envelopeParametrizedField('leftover'),
+ catCarryover: envelopeParametrizedField('carryover'),
+ catGoal: envelopeParametrizedField('goal'),
+ catLongGoal: envelopeParametrizedField('long-goal'),
+} satisfies BudgetType<'envelope-budget'>;
-export const reportBudget = {
+export const trackingBudget = {
totalBudgetedExpense: 'total-budgeted',
totalBudgetedIncome: 'total-budget-income',
totalBudgetedSaved: 'total-saved',
@@ -280,16 +280,16 @@ export const reportBudget = {
totalSaved: 'real-saved',
totalLeftover: 'total-leftover',
- groupSumAmount: reportParametrizedField('group-sum-amount'),
+ groupSumAmount: trackingParametrizedField('group-sum-amount'),
groupIncomeReceived: 'total-income',
- groupBudgeted: reportParametrizedField('group-budget'),
- groupBalance: reportParametrizedField('group-leftover'),
+ groupBudgeted: trackingParametrizedField('group-budget'),
+ groupBalance: trackingParametrizedField('group-leftover'),
- catBudgeted: reportParametrizedField('budget'),
- catSumAmount: reportParametrizedField('sum-amount'),
- catBalance: reportParametrizedField('leftover'),
- catCarryover: reportParametrizedField('carryover'),
- catGoal: reportParametrizedField('goal'),
- catLongGoal: reportParametrizedField('long-goal'),
-} satisfies BudgetType<'report-budget'>;
+ catBudgeted: trackingParametrizedField('budget'),
+ catSumAmount: trackingParametrizedField('sum-amount'),
+ catBalance: trackingParametrizedField('leftover'),
+ catCarryover: trackingParametrizedField('carryover'),
+ catGoal: trackingParametrizedField('goal'),
+ catLongGoal: trackingParametrizedField('long-goal'),
+} satisfies BudgetType<'tracking-budget'>;
diff --git a/packages/loot-core/src/client/state-types/modals.d.ts b/packages/loot-core/src/client/state-types/modals.d.ts
index ef8c148e4f..c1c5405ffd 100644
--- a/packages/loot-core/src/client/state-types/modals.d.ts
+++ b/packages/loot-core/src/client/state-types/modals.d.ts
@@ -157,7 +157,7 @@ type FinanceModals = {
onBudgetAction: (month: string, action: string, args?: unknown) => void;
onClose?: () => void;
};
- 'rollover-budget-menu': {
+ 'envelope-budget-menu': {
categoryId: string;
month: string;
onUpdateBudget: (amount: number) => void;
@@ -165,7 +165,7 @@ type FinanceModals = {
onSetMonthsAverage: (numberOfMonths: number) => void;
onApplyBudgetTemplate: () => void;
};
- 'report-budget-menu': {
+ 'tracking-budget-menu': {
categoryId: string;
month: string;
onUpdateBudget: (amount: number) => void;
@@ -187,8 +187,8 @@ type FinanceModals = {
name: string;
onSave: (id: string, notes: string) => void;
};
- 'report-budget-summary': { month: string };
- 'rollover-budget-summary': {
+ 'tracking-budget-summary': { month: string };
+ 'envelope-budget-summary': {
month: string;
onBudgetAction: (
month: string,
@@ -204,21 +204,21 @@ type FinanceModals = {
onValidate?: (value: string) => string;
onSubmit: (value: string) => Promise<void>;
};
- 'rollover-balance-menu': {
+ 'envelope-balance-menu': {
categoryId: string;
month: string;
onCarryover: (carryover: boolean) => void;
onTransfer: () => void;
onCover: () => void;
};
- 'rollover-summary-to-budget-menu': {
+ 'envelope-summary-to-budget-menu': {
month: string;
onTransfer: () => void;
onCover: () => void;
onHoldBuffer: () => void;
onResetHoldBuffer: () => void;
};
- 'report-balance-menu': {
+ 'tracking-balance-menu': {
categoryId: string;
month: string;
onCarryover: (carryover: boolean) => void;
@@ -252,12 +252,12 @@ type FinanceModals = {
onToggleHiddenCategories: () => void;
onSwitchBudgetFile: () => void;
};
- 'rollover-budget-month-menu': {
+ 'envelope-budget-month-menu': {
month: string;
onBudgetAction: (month: string, action: string, arg?: unknown) => void;
onEditNotes: (month: string) => void;
};
- 'report-budget-month-menu': {
+ 'tracking-budget-month-menu': {
month: string;
onBudgetAction: (month: string, action: string, arg?: unknown) => void;
onEditNotes: (month: string) => void;
diff --git a/packages/loot-core/src/server/budget/base.ts b/packages/loot-core/src/server/budget/base.ts
index dc6a5c9b26..56505d8d6d 100644
--- a/packages/loot-core/src/server/budget/base.ts
+++ b/packages/loot-core/src/server/budget/base.ts
@@ -6,8 +6,8 @@ import * as sheet from '../sheet';
import { resolveName } from '../spreadsheet/util';
import * as budgetActions from './actions';
+import * as envelopeBudget from './envelope';
import * as report from './report';
-import * as rollover from './rollover';
import { sumAmounts } from './util';
export function getBudgetType() {
@@ -56,7 +56,7 @@ function createCategory(cat, sheetName, prevSheetName, start, end) {
});
if (getBudgetType() === 'rollover') {
- rollover.createCategory(cat, sheetName, prevSheetName);
+ envelopeBudget.createCategory(cat, sheetName, prevSheetName);
} else {
report.createCategory(cat, sheetName, prevSheetName);
}
@@ -193,7 +193,7 @@ function handleCategoryChange(months, oldValue, newValue) {
(!oldValue || oldValue.tombstone === 1)
) {
if (budgetType === 'rollover') {
- rollover.createBlankCategory(newValue, months);
+ envelopeBudget.createBlankCategory(newValue, months);
}
months.forEach(month => {
@@ -400,7 +400,7 @@ export async function createBudget(months) {
const budgetType = getBudgetType();
if (budgetType === 'rollover') {
- rollover.createBudget(meta, categories, months);
+ envelopeBudget.createBudget(meta, categories, months);
}
months.forEach(month => {
@@ -418,7 +418,12 @@ export async function createBudget(months) {
});
if (budgetType === 'rollover') {
- rollover.createSummary(groups, categories, prevSheetName, sheetName);
+ envelopeBudget.createSummary(
+ groups,
+ categories,
+ prevSheetName,
+ sheetName,
+ );
} else {
report.createSummary(groups, categories, sheetName);
}
diff --git a/packages/loot-core/src/server/budget/rollover.ts b/packages/loot-core/src/server/budget/envelope.ts
similarity index 100%
rename from packages/loot-core/src/server/budget/rollover.ts
rename to packages/loot-core/src/server/budget/envelope.ts
diff --git a/packages/loot-core/src/server/main.ts b/packages/loot-core/src/server/main.ts
index 96dcd85522..d24ca17bef 100644
--- a/packages/loot-core/src/server/main.ts
+++ b/packages/loot-core/src/server/main.ts
@@ -176,7 +176,7 @@ handlers['get-budget-bounds'] = async function () {
return budget.createAllBudgets();
};
-handlers['rollover-budget-month'] = async function ({ month }) {
+handlers['envelope-budget-month'] = async function ({ month }) {
const groups = await db.getCategoriesGrouped();
const sheetName = monthUtils.sheetForMonth(month);
@@ -226,7 +226,7 @@ handlers['rollover-budget-month'] = async function ({ month }) {
return values;
};
-handlers['report-budget-month'] = async function ({ month }) {
+handlers['tracking-budget-month'] = async function ({ month }) {
const groups = await db.getCategoriesGrouped();
const sheetName = monthUtils.sheetForMonth(month);
diff --git a/packages/loot-core/src/types/server-handlers.d.ts b/packages/loot-core/src/types/server-handlers.d.ts
index 0d367452ec..3536dada43 100644
--- a/packages/loot-core/src/types/server-handlers.d.ts
+++ b/packages/loot-core/src/types/server-handlers.d.ts
@@ -59,14 +59,14 @@ export interface ServerHandlers {
'get-budget-bounds': () => Promise<{ start: string; end: string }>;
- 'rollover-budget-month': (arg: { month }) => Promise<
+ 'envelope-budget-month': (arg: { month }) => Promise<
{
value: string | number | boolean;
name: string;
}[]
>;
- 'report-budget-month': (arg: { month }) => Promise<
+ 'tracking-budget-month': (arg: { month }) => Promise<
{
value: string | number | boolean;
name: string;
diff --git a/upcoming-release-notes/3483.md b/upcoming-release-notes/3483.md
new file mode 100644
index 0000000000..b373bc07a9
--- /dev/null
+++ b/upcoming-release-notes/3483.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [MatissJanis]
+---
+
+File/variable renames: rollover budget -> envelope budget; report budget -> tracking budget.