{items.map((item, index) => {
- let name = getItemName(item);
+ const name = getItemName(item);
return (
{
+ const defaultGetHighlightedIndex = filteredSuggestions => {
return highlightFirst && filteredSuggestions.length ? 0 : null;
};
- let highlightedIndex = (
+ const highlightedIndex = (
getHighlightedIndex || defaultGetHighlightedIndex
)(filteredSuggestions);
// @ts-expect-error Types say there is no type
@@ -415,7 +415,7 @@ function SingleAutocomplete({
// If not using table behavior, reset the input on blur. Tables
// handle saving the value on blur.
- let value = selectedItem ? getItemId(selectedItem) : null;
+ const value = selectedItem ? getItemId(selectedItem) : null;
resetState(value);
} else {
@@ -423,7 +423,7 @@ function SingleAutocomplete({
}
},
onKeyDown: (e: KeyboardEvent
) => {
- let { onKeyDown } = inputProps || {};
+ const { onKeyDown } = inputProps || {};
// If the dropdown is open, an item is highlighted, and the user
// pressed enter, always capture that and handle it ourselves
@@ -561,15 +561,15 @@ function MultiAutocomplete({
strict,
...props
}: MultiAutocompleteProps) {
- let [focused, setFocused] = useState(false);
- let lastSelectedItems = useRef();
+ const [focused, setFocused] = useState(false);
+ const lastSelectedItems = useRef();
useEffect(() => {
lastSelectedItems.current = selectedItems;
});
function onRemoveItem(id) {
- let items = selectedItems.filter(i => i !== id);
+ const items = selectedItems.filter(i => i !== id);
onSelect(items);
}
diff --git a/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx b/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx
index 1ed1009f978..b8c07ba36db 100644
--- a/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx
+++ b/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx
@@ -15,6 +15,7 @@ import {
} from 'loot-core/src/types/models';
import Split from '../../icons/v0/Split';
+import { useResponsive } from '../../ResponsiveProvider';
import { type CSSProperties, theme } from '../../style';
import Text from '../common/Text';
import View from '../common/View';
@@ -116,7 +117,7 @@ export default function CategoryAutocomplete({
renderCategoryItem,
...props
}: CategoryAutocompleteProps) {
- let categorySuggestions: Array<
+ const categorySuggestions: Array<
CategoryEntity & { group?: CategoryGroupEntity }
> = useMemo(
() =>
@@ -220,6 +221,7 @@ export function SplitTransactionButton({
style,
...props
}: SplitTransactionButtonProps) {
+ const { isNarrowWidth } = useResponsive();
return (
{
- let type = item.transfer_acct ? 'account' : 'payee';
+ const type = item.transfer_acct ? 'account' : 'payee';
let title;
if (type === 'payee' && lastType !== type) {
title = 'Payees';
} else if (type === 'account' && lastType !== type) {
title = 'Transfer To/From';
}
- let showMoreMessage = idx === items.length - 1 && isFiltered;
+ const showMoreMessage = idx === items.length - 1 && isFiltered;
lastType = type;
return (
@@ -184,20 +185,20 @@ export default function PayeeAutocomplete({
payees,
...props
}: PayeeAutocompleteProps) {
- let cachedPayees = useCachedPayees();
+ const cachedPayees = useCachedPayees();
if (!payees) {
payees = cachedPayees;
}
- let cachedAccounts = useCachedAccounts();
+ const cachedAccounts = useCachedAccounts();
if (!accounts) {
accounts = cachedAccounts;
}
- let [focusTransferPayees, setFocusTransferPayees] = useState(false);
- let [rawPayee, setRawPayee] = useState('');
- let hasPayeeInput = !!rawPayee;
- let payeeSuggestions = useMemo(() => {
+ const [focusTransferPayees, setFocusTransferPayees] = useState(false);
+ const [rawPayee, setRawPayee] = useState('');
+ const hasPayeeInput = !!rawPayee;
+ const payeeSuggestions = useMemo(() => {
const suggestions = getPayeeSuggestions(
payees,
focusTransferPayees,
@@ -210,13 +211,13 @@ export default function PayeeAutocomplete({
return [{ id: 'new', name: '' }, ...suggestions];
}, [payees, focusTransferPayees, accounts, hasPayeeInput]);
- let dispatch = useDispatch();
+ const dispatch = useDispatch();
async function handleSelect(value, rawInputValue) {
if (tableBehavior) {
onSelect?.(makeNew(value, rawInputValue));
} else {
- let create = () => dispatch(createPayee(rawInputValue));
+ const create = () => dispatch(createPayee(rawInputValue));
if (Array.isArray(value)) {
value = await Promise.all(value.map(v => (v === 'new' ? create() : v)));
@@ -278,10 +279,10 @@ export default function PayeeAutocomplete({
});
filtered.sort((p1, p2) => {
- let r1 = p1.name.toLowerCase().startsWith(value.toLowerCase());
- let r2 = p2.name.toLowerCase().startsWith(value.toLowerCase());
- let r1exact = p1.name.toLowerCase() === value.toLowerCase();
- let r2exact = p2.name.toLowerCase() === value.toLowerCase();
+ const r1 = p1.name.toLowerCase().startsWith(value.toLowerCase());
+ const r2 = p2.name.toLowerCase().startsWith(value.toLowerCase());
+ const r1exact = p1.name.toLowerCase() === value.toLowerCase();
+ const r2exact = p2.name.toLowerCase() === value.toLowerCase();
// (maniacal laughter) mwahaHAHAHAHAH
if (p1.id === 'new') {
@@ -305,7 +306,7 @@ export default function PayeeAutocomplete({
}
});
- let isf = filtered.length > 100;
+ const isf = filtered.length > 100;
filtered = filtered.slice(0, 100);
filtered.filtered = isf;
@@ -373,19 +374,21 @@ export function CreatePayeeButton({
style,
...props
}: CreatePayeeButtonProps) {
+ const { isNarrowWidth } = useResponsive();
return (
{
- let items = useMemo(() => {
- let [expenseGroups, incomeGroup] = separateGroups(categoryGroups);
+ const items = useMemo(() => {
+ const [expenseGroups, incomeGroup] = separateGroups(categoryGroups);
let items = Array.prototype.concat.apply(
[],
@@ -53,7 +53,7 @@ const BudgetCategories = memo(
cat => showHiddenCategories || !cat.hidden,
);
- let items = [{ type: 'expense-group', value: { ...group } }];
+ const items = [{ type: 'expense-group', value: { ...group } }];
if (newCategoryForGroup === group.id) {
items.push({ type: 'new-category' });
@@ -103,13 +103,13 @@ const BudgetCategories = memo(
showHiddenCategories,
]);
- let [dragState, setDragState] = useState(null);
- let [savedCollapsed, setSavedCollapsed] = useState(null);
+ const [dragState, setDragState] = useState(null);
+ const [savedCollapsed, setSavedCollapsed] = useState(null);
// TODO: If we turn this into a reducer, we could probably memoize
// each item in the list for better perf
function onDragChange(newDragState) {
- let { state } = newDragState;
+ const { state } = newDragState;
if (state === 'start-preview') {
setDragState({
@@ -283,7 +283,7 @@ const BudgetCategories = memo(
throw new Error('Unknown item type: ' + item.type);
}
- let pos =
+ const pos =
idx === 0 ? 'first' : idx === items.length - 1 ? 'last' : null;
return (
diff --git a/packages/desktop-client/src/components/budget/BudgetMonthCountContext.tsx b/packages/desktop-client/src/components/budget/BudgetMonthCountContext.tsx
index 4a825f4ec20..a69e40fb69f 100644
--- a/packages/desktop-client/src/components/budget/BudgetMonthCountContext.tsx
+++ b/packages/desktop-client/src/components/budget/BudgetMonthCountContext.tsx
@@ -12,7 +12,8 @@ type BudgetMonthCountContextValue = {
setDisplayMax: Dispatch>;
};
-let BudgetMonthCountContext = createContext(null);
+const BudgetMonthCountContext =
+ createContext(null);
type BudgetMonthCountProviderProps = {
children: ReactNode;
@@ -21,7 +22,7 @@ type BudgetMonthCountProviderProps = {
export function BudgetMonthCountProvider({
children,
}: BudgetMonthCountProviderProps) {
- let [displayMax, setDisplayMax] = useState(1);
+ const [displayMax, setDisplayMax] = useState(1);
return (
diff --git a/packages/desktop-client/src/components/budget/BudgetPageHeader.tsx b/packages/desktop-client/src/components/budget/BudgetPageHeader.tsx
index c5f3576c70b..919793bc3f6 100644
--- a/packages/desktop-client/src/components/budget/BudgetPageHeader.tsx
+++ b/packages/desktop-client/src/components/budget/BudgetPageHeader.tsx
@@ -17,8 +17,8 @@ type BudgetPageHeaderProps = {
const BudgetPageHeader = memo(
({ startMonth, onMonthSelect, numMonths, monthBounds }) => {
function getValidMonth(month) {
- let start = monthBounds.start;
- let end = monthUtils.subMonths(monthBounds.end, numMonths - 1);
+ const start = monthBounds.start;
+ const end = monthUtils.subMonths(monthBounds.end, numMonths - 1);
if (month < start) {
return start;
diff --git a/packages/desktop-client/src/components/budget/BudgetSummaries.tsx b/packages/desktop-client/src/components/budget/BudgetSummaries.tsx
index 11dc77f5bc2..1367005cc11 100644
--- a/packages/desktop-client/src/components/budget/BudgetSummaries.tsx
+++ b/packages/desktop-client/src/components/budget/BudgetSummaries.tsx
@@ -25,37 +25,37 @@ type BudgetSummariesProps = {
export default function BudgetSummaries({
SummaryComponent,
}: BudgetSummariesProps) {
- let { months } = useContext(MonthsContext);
+ const { months } = useContext(MonthsContext);
- let [widthState, setWidthState] = useState(0);
- let [styles, spring] = useSpring(() => ({
+ const [widthState, setWidthState] = useState(0);
+ const [styles, spring] = useSpring(() => ({
x: 0,
config: { mass: 3, tension: 600, friction: 80 },
}));
- let containerRef = useResizeObserver(
+ const containerRef = useResizeObserver(
useCallback(rect => {
setWidthState(rect.width);
}, []),
);
- let prevMonth0 = useRef(months[0]);
- let allMonths = [...months];
+ const prevMonth0 = useRef(months[0]);
+ const allMonths = [...months];
allMonths.unshift(subMonths(months[0], 1));
allMonths.push(addMonths(months[months.length - 1], 1));
- let monthWidth = widthState / months.length;
+ const monthWidth = widthState / months.length;
useLayoutEffect(() => {
- let prevMonth = prevMonth0.current;
- let reversed = prevMonth > months[0];
- let offsetX = monthWidth;
+ const prevMonth = prevMonth0.current;
+ const reversed = prevMonth > months[0];
+ const offsetX = monthWidth;
let from = reversed ? -offsetX * 2 : 0;
if (prevMonth !== allMonths[0] && prevMonth !== allMonths[2]) {
from = -offsetX;
}
- let to = -offsetX;
+ const to = -offsetX;
spring.start({ from: { x: from }, x: to });
}, [months[0]]);
diff --git a/packages/desktop-client/src/components/budget/BudgetTable.js b/packages/desktop-client/src/components/budget/BudgetTable.js
index 46568a28847..1059c0633fd 100644
--- a/packages/desktop-client/src/components/budget/BudgetTable.js
+++ b/packages/desktop-client/src/components/budget/BudgetTable.js
@@ -33,16 +33,20 @@ class BudgetTable extends Component {
};
onReorderCategory = (id, dropPos, targetId) => {
- let { categoryGroups } = this.props;
+ const { categoryGroups } = this.props;
- let isGroup = !!categoryGroups.find(g => g.id === targetId);
+ const isGroup = !!categoryGroups.find(g => g.id === targetId);
if (isGroup) {
- let { targetId: groupId } = findSortUp(categoryGroups, dropPos, targetId);
- let group = categoryGroups.find(g => g.id === groupId);
+ const { targetId: groupId } = findSortUp(
+ categoryGroups,
+ dropPos,
+ targetId,
+ );
+ const group = categoryGroups.find(g => g.id === groupId);
if (group) {
- let { categories } = group;
+ const { categories } = group;
this.props.onReorderCategory({
id,
groupId: group.id,
@@ -55,7 +59,7 @@ class BudgetTable extends Component {
} else {
let targetGroup;
- for (let group of categoryGroups) {
+ for (const group of categoryGroups) {
if (group.categories.find(cat => cat.id === targetId)) {
targetGroup = group;
break;
@@ -71,7 +75,7 @@ class BudgetTable extends Component {
};
onReorderGroup = (id, dropPos, targetId) => {
- let { categoryGroups } = this.props;
+ const { categoryGroups } = this.props;
this.props.onReorderGroup({
id,
@@ -80,8 +84,8 @@ class BudgetTable extends Component {
};
moveVertically = dir => {
- let { editing } = this.state;
- let { type, categoryGroups, collapsed } = this.props;
+ const { editing } = this.state;
+ const { type, categoryGroups, collapsed } = this.props;
const flattened = categoryGroups.reduce((all, group) => {
if (collapsed.includes(group.id)) {
@@ -151,12 +155,12 @@ class BudgetTable extends Component {
};
collapseAllCategories = () => {
- let { setCollapsed, categoryGroups } = this.props;
+ const { setCollapsed, categoryGroups } = this.props;
setCollapsed(categoryGroups.map(g => g.id));
};
render() {
- let {
+ const {
type,
categoryGroups,
prewarmStartMonth,
@@ -177,7 +181,7 @@ class BudgetTable extends Component {
onShowNewGroup,
onHideNewGroup,
} = this.props;
- let { editing, draggingState, showHiddenCategories } = this.state;
+ const { editing, draggingState, showHiddenCategories } = this.state;
return (
{
- let prefs = useSelector(state => state.prefs.local);
- let { setDisplayMax } = useBudgetMonthCount();
- let actions = useActions();
+ const prefs = useSelector(state => state.prefs.local);
+ const { setDisplayMax } = useBudgetMonthCount();
+ const actions = useActions();
- let numPossible = getNumPossibleMonths(width);
- let numMonths = Math.min(numPossible, maxMonths);
- let maxWidth = 200 + 500 * numMonths;
+ const numPossible = getNumPossibleMonths(width);
+ const numMonths = Math.min(numPossible, maxMonths);
+ const maxWidth = 200 + 500 * numMonths;
useEffect(() => {
setDisplayMax(numPossible);
diff --git a/packages/desktop-client/src/components/budget/ExpenseCategory.tsx b/packages/desktop-client/src/components/budget/ExpenseCategory.tsx
index af20de7e541..cc131396687 100644
--- a/packages/desktop-client/src/components/budget/ExpenseCategory.tsx
+++ b/packages/desktop-client/src/components/budget/ExpenseCategory.tsx
@@ -52,14 +52,14 @@ function ExpenseCategory({
dragging = true;
}
- let { dragRef } = useDraggable({
+ const { dragRef } = useDraggable({
type: 'category',
onDragChange,
item: cat,
canDrag: editingCell === null,
});
- let { dropRef, dropPos } = useDroppable({
+ const { dropRef, dropPos } = useDroppable({
types: 'category',
id: cat.id,
onDrop: onReorder,
diff --git a/packages/desktop-client/src/components/budget/ExpenseGroup.tsx b/packages/desktop-client/src/components/budget/ExpenseGroup.tsx
index 6104e012545..7c1bfd8983f 100644
--- a/packages/desktop-client/src/components/budget/ExpenseGroup.tsx
+++ b/packages/desktop-client/src/components/budget/ExpenseGroup.tsx
@@ -48,22 +48,22 @@ function ExpenseGroup({
onToggleCollapse,
onShowNewCategory,
}: ExpenseGroupProps) {
- let dragging = dragState && dragState.item === group;
+ const dragging = dragState && dragState.item === group;
- let { dragRef } = useDraggable({
+ const { dragRef } = useDraggable({
type: 'group',
onDragChange,
item: group,
canDrag: editingCell === null,
});
- let { dropRef, dropPos } = useDroppable({
+ const { dropRef, dropPos } = useDroppable({
types: 'group',
id: group.id,
onDrop: onReorderGroup,
});
- let { dropRef: catDropRef, dropPos: catDropPos } = useDroppable({
+ const { dropRef: catDropRef, dropPos: catDropPos } = useDroppable({
types: 'category',
id: group.id,
onDrop: onReorderCategory,
diff --git a/packages/desktop-client/src/components/budget/IncomeCategory.tsx b/packages/desktop-client/src/components/budget/IncomeCategory.tsx
index 110da55231e..0d5625186da 100644
--- a/packages/desktop-client/src/components/budget/IncomeCategory.tsx
+++ b/packages/desktop-client/src/components/budget/IncomeCategory.tsx
@@ -43,14 +43,14 @@ function IncomeCategory({
onReorder,
onShowActivity,
}: IncomeCategoryProps) {
- let { dragRef } = useDraggable({
+ const { dragRef } = useDraggable({
type: 'income-category',
onDragChange,
item: cat,
canDrag: editingCell === null,
});
- let { dropRef, dropPos } = useDroppable({
+ const { dropRef, dropPos } = useDroppable({
types: 'income-category',
id: cat.id,
onDrop: onReorder,
diff --git a/packages/desktop-client/src/components/budget/MobileBudget.js b/packages/desktop-client/src/components/budget/MobileBudget.js
index 4f9e1601c18..8c3e7327c65 100644
--- a/packages/desktop-client/src/components/budget/MobileBudget.js
+++ b/packages/desktop-client/src/components/budget/MobileBudget.js
@@ -41,7 +41,7 @@ class Budget extends Component {
}
async loadCategories() {
- let result = await this.props.getCategories();
+ const result = await this.props.getCategories();
this.setState({ categoryGroups: result.grouped });
}
@@ -63,7 +63,7 @@ class Budget extends Component {
this.setState({ initialized: true });
- let unlisten = listen('sync-event', ({ type, tables }) => {
+ const unlisten = listen('sync-event', ({ type, tables }) => {
if (
type === 'success' &&
(tables.includes('categories') ||
@@ -145,14 +145,14 @@ class Budget extends Component {
};
onDeleteGroup = async groupId => {
- let group = this.state.categoryGroups?.find(g => g.id === groupId);
+ const group = this.state.categoryGroups?.find(g => g.id === groupId);
if (!group) {
return;
}
let mustTransfer = false;
- for (let category of group.categories) {
+ for (const category of group.categories) {
if (await send('must-category-transfer', { id: category.id })) {
mustTransfer = true;
break;
@@ -210,21 +210,22 @@ class Budget extends Component {
};
onReorderCategory = (id, { inGroup, aroundCategory }) => {
- let { categoryGroups } = this.state;
+ const { categoryGroups } = this.state;
let groupId, targetId;
if (inGroup) {
groupId = inGroup;
} else if (aroundCategory) {
- let { id: catId, position } = aroundCategory;
+ const { id: originalCatId, position } = aroundCategory;
- let group = categoryGroups.find(group =>
+ let catId = originalCatId;
+ const group = categoryGroups.find(group =>
group.categories.find(cat => cat.id === catId),
);
if (position === 'bottom') {
- let { categories } = group;
- let idx = categories.findIndex(cat => cat.id === catId);
+ const { categories } = group;
+ const idx = categories.findIndex(cat => cat.id === catId);
catId = idx < categories.length - 1 ? categories[idx + 1].id : null;
}
@@ -240,10 +241,10 @@ class Budget extends Component {
};
onReorderGroup = (id, targetId, position) => {
- let { categoryGroups } = this.state;
+ const { categoryGroups } = this.state;
if (position === 'bottom') {
- let idx = categoryGroups.findIndex(group => group.id === targetId);
+ const idx = categoryGroups.findIndex(group => group.id === targetId);
targetId =
idx < categoryGroups.length - 1 ? categoryGroups[idx + 1].id : null;
}
@@ -266,23 +267,23 @@ class Budget extends Component {
};
onPrevMonth = async () => {
- let { spreadsheet, budgetType } = this.props;
- let month = monthUtils.subMonths(this.state.currentMonth, 1);
+ const { spreadsheet, budgetType } = this.props;
+ const month = monthUtils.subMonths(this.state.currentMonth, 1);
await prewarmMonth(budgetType, spreadsheet, month);
this.setState({ currentMonth: month, initialized: true });
};
onNextMonth = async () => {
- let { spreadsheet, budgetType } = this.props;
- let month = monthUtils.addMonths(this.state.currentMonth, 1);
+ const { spreadsheet, budgetType } = this.props;
+ const month = monthUtils.addMonths(this.state.currentMonth, 1);
await prewarmMonth(budgetType, spreadsheet, month);
this.setState({ currentMonth: month, initialized: true });
};
onOpenActionSheet = () => {
- let { budgetType } = this.props;
+ const { budgetType } = this.props;
- let options = [
+ const options = [
'Edit Categories',
'Copy last month’s budget',
'Set budgets to zero',
@@ -352,8 +353,8 @@ class Budget extends Component {
applyBudgetAction,
pushModal,
} = this.props;
- let numberFormat = prefs.numberFormat || 'comma-dot';
- let hideFraction = prefs.hideFraction || false;
+ const numberFormat = prefs.numberFormat || 'comma-dot';
+ const hideFraction = prefs.hideFraction || false;
if (!categoryGroups || !initialized) {
return (
@@ -414,14 +415,14 @@ class Budget extends Component {
}
export default function BudgetWrapper() {
- let { list: categories, grouped: categoryGroups } = useCategories();
- let budgetType = useSelector(
+ const { list: categories, grouped: categoryGroups } = useCategories();
+ const budgetType = useSelector(
state => state.prefs.local.budgetType || 'rollover',
);
- let prefs = useSelector(state => state.prefs.local);
+ const prefs = useSelector(state => state.prefs.local);
- let actions = useActions();
- let spreadsheet = useSpreadsheet();
+ const actions = useActions();
+ const spreadsheet = useSpreadsheet();
useSetThemeColor(theme.mobileViewTheme);
return (
{
if (isBudgetActionMenuOpen) {
@@ -277,7 +276,7 @@ const ExpenseCategory = memo(function ExpenseCategory({
}
}, [isEditing, tooltip]);
- let onSubmit = () => {
+ const onSubmit = () => {
if (categoryName) {
onSave?.({
...category,
@@ -289,7 +288,7 @@ const ExpenseCategory = memo(function ExpenseCategory({
onEdit?.(null);
};
- let onMenuSelect = type => {
+ const onMenuSelect = type => {
onEdit?.(null);
switch (type) {
case 'toggle-visibility':
@@ -307,10 +306,10 @@ const ExpenseCategory = memo(function ExpenseCategory({
}
};
- let listItemRef = useRef();
- let inputRef = useRef();
+ const listItemRef = useRef();
+ const inputRef = useRef();
- let _onBudgetAction = (monthIndex, action, arg) => {
+ const _onBudgetAction = (monthIndex, action, arg) => {
onBudgetAction?.(
monthUtils.getMonthFromIndex(monthUtils.getYear(month), monthIndex),
action,
@@ -318,7 +317,7 @@ const ExpenseCategory = memo(function ExpenseCategory({
);
};
- let content = (
+ const content = (
{
if (!isEditing && tooltip.isOpen) {
@@ -570,7 +569,7 @@ const ExpenseGroupTotals = memo(function ExpenseGroupTotals({
}
}, [isEditing]);
- let onSubmit = () => {
+ const onSubmit = () => {
if (groupName) {
onSave?.({
...group,
@@ -582,7 +581,7 @@ const ExpenseGroupTotals = memo(function ExpenseGroupTotals({
onEdit?.(null);
};
- let onMenuSelect = type => {
+ const onMenuSelect = type => {
onEdit?.(null);
switch (type) {
case 'add-category':
@@ -603,10 +602,10 @@ const ExpenseGroupTotals = memo(function ExpenseGroupTotals({
}
};
- let listItemRef = useRef();
- let inputRef = useRef();
+ const listItemRef = useRef();
+ const inputRef = useRef();
- let content = (
+ const content = (
{
if (!isEditing && tooltip.isOpen) {
@@ -824,7 +823,7 @@ const IncomeGroupTotals = memo(function IncomeGroupTotals({
}
}, [isEditing]);
- let onSubmit = () => {
+ const onSubmit = () => {
if (groupName) {
onSave?.({
...group,
@@ -836,7 +835,7 @@ const IncomeGroupTotals = memo(function IncomeGroupTotals({
onEdit?.(null);
};
- let onMenuSelect = type => {
+ const onMenuSelect = type => {
onEdit?.(null);
switch (type) {
case 'add-category':
@@ -857,8 +856,8 @@ const IncomeGroupTotals = memo(function IncomeGroupTotals({
}
};
- let listItemRef = useRef();
- let inputRef = useRef();
+ const listItemRef = useRef();
+ const inputRef = useRef();
return (
{
if (!isEditing && tooltip.isOpen) {
@@ -1032,7 +1031,7 @@ const IncomeCategory = memo(function IncomeCategory({
}
}, [isEditing]);
- let onSubmit = () => {
+ const onSubmit = () => {
if (categoryName) {
onSave?.({
...category,
@@ -1044,7 +1043,7 @@ const IncomeCategory = memo(function IncomeCategory({
onEdit?.(null);
};
- let onMenuSelect = type => {
+ const onMenuSelect = type => {
onEdit?.(null);
switch (type) {
case 'toggle-visibility':
@@ -1062,8 +1061,8 @@ const IncomeCategory = memo(function IncomeCategory({
}
};
- let listItemRef = useRef();
- let inputRef = useRef();
+ const listItemRef = useRef();
+ const inputRef = useRef();
return (
= 360;
// let editMode = false; // neuter editMode -- sorry, not rewriting drag-n-drop right now
- let currentMonth = monthUtils.currentMonth();
- let format = useFormat();
+ const format = useFormat();
const mobileShowBudgetedColPref = useSelector(state => {
return state.prefs?.local?.toggleMobileDisplayPref || true;
@@ -1706,7 +1704,7 @@ export function BudgetTable(props) {
return state.prefs?.local?.['budget.showHiddenCategories'] || false;
});
- let [showBudgetedCol, setShowBudgetedCol] = useState(
+ const [showBudgetedCol, setShowBudgetedCol] = useState(
!mobileShowBudgetedColPref &&
!document.cookie.match(/mobileShowBudgetedColPref=true/),
);
@@ -1718,33 +1716,68 @@ export function BudgetTable(props) {
}
}
- let buttonStyle = {
+ const buttonStyle = {
padding: 0,
backgroundColor: 'transparent',
borderRadius: 'unset',
};
+ const _onSwitchBudgetType = () => {
+ pushModal('switch-budget-type', {
+ onSwitch: onSwitchBudgetType,
+ });
+ };
+
+ const onToggleHiddenCategories = () => {
+ savePrefs({
+ 'budget.showHiddenCategories': !showHiddenCategories,
+ });
+ };
+
return (
-
-
+
+ }
+ headerRightContent={
+ !editMode ? (
+
+ ) : (
+
+ )
+ }
+ style={{ flex: 1 }}
+ >
{type === 'report' ? (
= currentMonth}
+ projected={month >= monthUtils.currentMonth()}
onClick={onShowBudgetSummary}
/>
) : (
@@ -1873,308 +1906,222 @@ export function BudgetTable(props) {
/>
-
-
- {!editMode ? (
- // (this.list = el)}
- // keyboardShouldPersistTaps="always"
- // refreshControl={refreshControl}
- // style={{ backgroundColor: colors.n10 }}
- // automaticallyAdjustContentInsets={false}
- // >
-
-
-
- ) : (
- //
- //
- // {({
- // dragging,
- // onGestureEvent,
- // onHandlerStateChange,
- // scrollRef,
- // onScroll
- // }) => (
-
-
-
+
+ {!editMode ? (
+ // (this.list = el)}
+ // keyboardShouldPersistTaps="always"
+ // refreshControl={refreshControl}
+ // style={{ backgroundColor: colors.n10 }}
+ // automaticallyAdjustContentInsets={false}
+ // >
+
+
+
+ ) : (
+ //
+ //
+ // {({
+ // dragging,
+ // onGestureEvent,
+ // onHandlerStateChange,
+ // scrollRef,
+ // onScroll
+ // }) => (
+
+
+
- //
- //
- )}
-
-
-
+ //
+ //
+ )}
+
+
);
}
-const LEFT_RIGHT_FLEX_WIDTH = 80;
-const BUDGET_HEADER_HEIGHT = 50;
-
-function BudgetHeader({
- currentMonth,
- monthBounds,
- onPrevMonth,
- onNextMonth,
- editMode,
+function BudgetMenu({
onEditMode,
- showHiddenCategories,
- savePrefs,
- pushModal,
+ onToggleHiddenCategories,
onSwitchBudgetType,
}) {
- let serverURL = useServerURL();
+ const tooltip = useTooltip();
+ const isReportBudgetEnabled = useFeatureFlag('reportBudget');
- let prevEnabled = currentMonth > monthBounds.start;
- let nextEnabled = currentMonth < monthUtils.subMonths(monthBounds.end, 1);
-
- let buttonStyle = {
- padding: 10,
- margin: 2,
- };
-
- let toggleHiddenCategories = () => {
- savePrefs({
- 'budget.showHiddenCategories': !showHiddenCategories,
- });
- };
-
- let tooltip = useTooltip();
- let isReportBudgetEnabled = useFeatureFlag('reportBudget');
-
- let onMenuSelect = name => {
+ const onMenuSelect = name => {
tooltip.close();
switch (name) {
case 'edit-mode':
onEditMode?.(true);
break;
case 'toggle-hidden-categories':
- toggleHiddenCategories();
+ onToggleHiddenCategories?.();
break;
case 'switch-budget-type':
- pushModal('switch-budget-type', {
- onSwitch: onSwitchBudgetType,
- });
+ onSwitchBudgetType?.();
break;
default:
throw new Error(`Unrecognized menu option: ${name}`);
}
};
+ return (
+ <>
+
+ {tooltip.isOpen && (
+
+
+
+ )}
+
+ );
+}
+
+function MonthSelector({ month, monthBounds, onPrevMonth, onNextMonth }) {
+ const prevEnabled = month > monthBounds.start;
+ const nextEnabled = month < monthUtils.subMonths(monthBounds.end, 1);
+
+ const arrowButtonStyle = {
+ padding: 10,
+ margin: 2,
+ };
+
return (
-
- {serverURL && (
-
- )}
-
-
-
+
+
-
-
- {/* eslint-disable-next-line rulesdir/typography */}
- {monthUtils.format(currentMonth, "MMMM ''yy")}
-
-
-
-
+
+
+
);
}
diff --git a/packages/desktop-client/src/components/budget/MonthCountSelector.tsx b/packages/desktop-client/src/components/budget/MonthCountSelector.tsx
index 8a325e18f23..c3509bc20bc 100644
--- a/packages/desktop-client/src/components/budget/MonthCountSelector.tsx
+++ b/packages/desktop-client/src/components/budget/MonthCountSelector.tsx
@@ -29,7 +29,7 @@ export function MonthCountSelector({
maxMonths,
onChange,
}: MonthCountSelectorProps) {
- let { displayMax } = useBudgetMonthCount();
+ const { displayMax } = useBudgetMonthCount();
// It doesn't make sense to show anything if we can only fit one
// month
@@ -37,7 +37,7 @@ export function MonthCountSelector({
return null;
}
- let calendars = [];
+ const calendars = [];
for (let i = 1; i <= displayMax; i++) {
calendars.push(
(null);
+export const MonthsContext = createContext(null);
type MonthsProviderProps = {
startMonth: string | undefined;
@@ -40,9 +40,9 @@ export function MonthsProvider({
type,
children,
}: MonthsProviderProps) {
- let endMonth = monthUtils.addMonths(startMonth, numMonths - 1);
- let bounds = getValidMonthBounds(monthBounds, startMonth, endMonth);
- let months = monthUtils.rangeInclusive(bounds.start, bounds.end);
+ const endMonth = monthUtils.addMonths(startMonth, numMonths - 1);
+ const bounds = getValidMonthBounds(monthBounds, startMonth, endMonth);
+ const months = monthUtils.rangeInclusive(bounds.start, bounds.end);
return (
diff --git a/packages/desktop-client/src/components/budget/RenderMonths.tsx b/packages/desktop-client/src/components/budget/RenderMonths.tsx
index 362ebafcec4..649734d9755 100644
--- a/packages/desktop-client/src/components/budget/RenderMonths.tsx
+++ b/packages/desktop-client/src/components/budget/RenderMonths.tsx
@@ -25,10 +25,10 @@ function RenderMonths({
args,
style,
}: RenderMonthsProps) {
- let { months } = useContext(MonthsContext);
+ const { months } = useContext(MonthsContext);
return months.map((month, index) => {
- let editing = editingIndex === index;
+ const editing = editingIndex === index;
return (
{
- let { titlebar, budgetType } = props;
+ const { titlebar, budgetType } = props;
async function run() {
loadCategories();
- let { start, end } = await send('get-budget-bounds');
+ const { start, end } = await send('get-budget-bounds');
setBounds({ start, end });
await prewarmAllMonths(
@@ -147,7 +147,7 @@ function Budget(props: BudgetProps) {
run();
- let unlistens = [
+ const unlistens = [
listen('sync-event', ({ type, tables }) => {
if (
type === 'success' &&
@@ -255,7 +255,7 @@ function Budget(props: BudgetProps) {
};
const onSaveCategory = async category => {
- let exists =
+ const exists =
(await props.getCategories()).grouped
.filter(g => g.id === category.cat_group)[0]
.categories.filter(
@@ -270,7 +270,7 @@ function Budget(props: BudgetProps) {
}
if (category.id === 'new') {
- let id = await props.createCategory(
+ const id = await props.createCategory(
category.name,
category.cat_group,
category.is_income,
@@ -313,7 +313,7 @@ function Budget(props: BudgetProps) {
const onSaveGroup = async group => {
if (group.id === 'new') {
- let id = await props.createGroup(group.name);
+ const id = await props.createGroup(group.name);
setIsAddingGroup(false);
setCategoryGroups(state =>
addGroup(state, {
@@ -330,10 +330,10 @@ function Budget(props: BudgetProps) {
};
const onDeleteGroup = async id => {
- let group = categoryGroups.find(g => g.id === id);
+ const group = categoryGroups.find(g => g.id === id);
let mustTransfer = false;
- for (let category of group.categories) {
+ for (const category of group.categories) {
if (await send('must-category-transfer', { id: category.id })) {
mustTransfer = true;
break;
@@ -377,9 +377,9 @@ function Budget(props: BudgetProps) {
};
const onReorderCategory = async sortInfo => {
- let cats = await props.getCategories();
- let moveCandidate = cats.list.filter(c => c.id === sortInfo.id)[0];
- let exists =
+ const cats = await props.getCategories();
+ const moveCandidate = cats.list.filter(c => c.id === sortInfo.id)[0];
+ const exists =
cats.grouped
.filter(g => g.id === sortInfo.groupId)[0]
.categories.filter(
@@ -406,7 +406,7 @@ function Budget(props: BudgetProps) {
};
const onToggleCollapse = () => {
- let collapsed = !summaryCollapsed;
+ const collapsed = !summaryCollapsed;
setSummaryCollapsed(collapsed);
props.savePrefs({ 'budget.summaryCollapsed': collapsed });
};
@@ -427,14 +427,14 @@ function Budget(props: BudgetProps) {
}
};
- let {
- maxMonths,
+ const {
+ maxMonths: originalMaxMonths,
budgetType: type,
reportComponents,
rolloverComponents,
} = props;
- maxMonths = maxMonths || 1;
+ const maxMonths = originalMaxMonths || 1;
if (!initialized || !categoryGroups) {
return null;
@@ -532,27 +532,29 @@ const RolloverBudgetSummary = memo<{ month: string }>(props => {
});
export default function BudgetWrapper(props) {
- let startMonth = useSelector(state => state.prefs.local['budget.startMonth']);
- let collapsedPrefs = useSelector(
+ const startMonth = useSelector(
+ state => state.prefs.local['budget.startMonth'],
+ );
+ const collapsedPrefs = useSelector(
state => state.prefs.local['budget.collapsed'],
);
- let summaryCollapsed = useSelector(
+ const summaryCollapsed = useSelector(
state => state.prefs.local['budget.summaryCollapsed'],
);
- let budgetType = useSelector(
+ const budgetType = useSelector(
state => state.prefs.local.budgetType || 'rollover',
);
- let maxMonths = useSelector(state => state.prefs.global.maxMonths);
- let { grouped: categoryGroups } = useCategories();
+ const maxMonths = useSelector(state => state.prefs.global.maxMonths);
+ const { grouped: categoryGroups } = useCategories();
- let actions = useActions();
- let spreadsheet = useSpreadsheet();
- let titlebar = useContext(TitlebarContext);
- let location = useLocation();
- let match = useMatch(location.pathname);
- let navigate = useNavigate();
+ const actions = useActions();
+ const spreadsheet = useSpreadsheet();
+ const titlebar = useContext(TitlebarContext);
+ const location = useLocation();
+ const match = useMatch(location.pathname);
+ const navigate = useNavigate();
- let reportComponents = useMemo(
+ const reportComponents = useMemo(
() => ({
SummaryComponent: report.BudgetSummary,
ExpenseCategoryComponent: report.ExpenseCategoryMonth,
@@ -565,7 +567,7 @@ export default function BudgetWrapper(props) {
[report],
);
- let rolloverComponents = useMemo(
+ const rolloverComponents = useMemo(
() => ({
SummaryComponent: RolloverBudgetSummary,
ExpenseCategoryComponent: rollover.ExpenseCategoryMonth,
diff --git a/packages/desktop-client/src/components/budget/report/BalanceTooltip.tsx b/packages/desktop-client/src/components/budget/report/BalanceTooltip.tsx
index 4d34915a5e3..c1c297518a8 100644
--- a/packages/desktop-client/src/components/budget/report/BalanceTooltip.tsx
+++ b/packages/desktop-client/src/components/budget/report/BalanceTooltip.tsx
@@ -22,9 +22,9 @@ export default function BalanceTooltip({
onClose,
...tooltipProps
}: BalanceTooltipProps) {
- let carryover = useSheetValue(reportBudget.catCarryover(categoryId));
+ const carryover = useSheetValue(reportBudget.catCarryover(categoryId));
- let _onClose = () => {
+ const _onClose = () => {
tooltip.close();
onClose?.();
};
diff --git a/packages/desktop-client/src/components/budget/report/ReportComponents.tsx b/packages/desktop-client/src/components/budget/report/ReportComponents.tsx
index 1d3d03bb8d3..ed38d3bab9d 100644
--- a/packages/desktop-client/src/components/budget/report/ReportComponents.tsx
+++ b/packages/desktop-client/src/components/budget/report/ReportComponents.tsx
@@ -20,7 +20,7 @@ import { makeAmountGrey } from '../util';
import BalanceTooltip from './BalanceTooltip';
-let headerLabelStyle: CSSProperties = {
+const headerLabelStyle: CSSProperties = {
flex: 1,
padding: '0 5px',
textAlign: 'right',
@@ -91,7 +91,7 @@ type GroupMonthProps = {
group: { id: string; is_income: boolean };
};
export const GroupMonth = memo(function GroupMonth({ group }: GroupMonthProps) {
- let { id } = group;
+ const { id } = group;
return (
@@ -156,7 +156,7 @@ export const CategoryMonth = memo(function CategoryMonth({
onBudgetAction,
onShowActivity,
}: CategoryMonthProps) {
- let balanceTooltip = useTooltip();
+ const balanceTooltip = useTooltip();
const [menuOpen, setMenuOpen] = useState(false);
const [hover, setHover] = useState(false);
const isGoalTemplatesEnabled = useFeatureFlag('goalTemplatesEnabled');
diff --git a/packages/desktop-client/src/components/budget/report/ReportContext.tsx b/packages/desktop-client/src/components/budget/report/ReportContext.tsx
index fc9927882e7..e38b4da869f 100644
--- a/packages/desktop-client/src/components/budget/report/ReportContext.tsx
+++ b/packages/desktop-client/src/components/budget/report/ReportContext.tsx
@@ -2,7 +2,7 @@ import React, { type ReactNode, createContext, useContext } from 'react';
import * as monthUtils from 'loot-core/src/shared/months';
-let Context = createContext(null);
+const Context = createContext(null);
type ReportProviderProps = {
summaryCollapsed: boolean;
@@ -16,7 +16,7 @@ export function ReportProvider({
onToggleSummaryCollapse,
children,
}: ReportProviderProps) {
- let currentMonth = monthUtils.currentMonth();
+ const currentMonth = monthUtils.currentMonth();
return (
+ >
+ {children}
+
);
}
diff --git a/packages/desktop-client/src/components/budget/report/budgetsummary/BudgetSummary.tsx b/packages/desktop-client/src/components/budget/report/budgetsummary/BudgetSummary.tsx
index d1f726a7ed5..58e18d32a0a 100644
--- a/packages/desktop-client/src/components/budget/report/budgetsummary/BudgetSummary.tsx
+++ b/packages/desktop-client/src/components/budget/report/budgetsummary/BudgetSummary.tsx
@@ -26,7 +26,7 @@ type BudgetSummaryProps = {
month?: string;
};
export default function BudgetSummary({ month }: BudgetSummaryProps) {
- let {
+ const {
currentMonth,
summaryCollapsed: collapsed,
onBudgetAction,
@@ -35,7 +35,7 @@ export default function BudgetSummary({ month }: BudgetSummaryProps) {
const isGoalTemplatesEnabled = useFeatureFlag('goalTemplatesEnabled');
- let [menuOpen, setMenuOpen] = useState(false);
+ const [menuOpen, setMenuOpen] = useState(false);
function onMenuOpen() {
setMenuOpen(true);
}
@@ -44,7 +44,7 @@ export default function BudgetSummary({ month }: BudgetSummaryProps) {
setMenuOpen(false);
}
- let ExpandOrCollapseIcon = collapsed ? ArrowButtonDown1 : ArrowButtonUp1;
+ const ExpandOrCollapseIcon = collapsed ? ArrowButtonDown1 : ArrowButtonUp1;
return (
diff --git a/packages/desktop-client/src/components/budget/report/budgetsummary/Saved.tsx b/packages/desktop-client/src/components/budget/report/budgetsummary/Saved.tsx
index 8c8768e3e72..80fbf1b74ac 100644
--- a/packages/desktop-client/src/components/budget/report/budgetsummary/Saved.tsx
+++ b/packages/desktop-client/src/components/budget/report/budgetsummary/Saved.tsx
@@ -20,11 +20,11 @@ type SavedProps = {
style?: CSSProperties;
};
export default function Saved({ projected, style }: SavedProps) {
- let budgetedSaved = useSheetValue(reportBudget.totalBudgetedSaved) || 0;
- let totalSaved = useSheetValue(reportBudget.totalSaved) || 0;
- let format = useFormat();
- let saved = projected ? budgetedSaved : totalSaved;
- let isNegative = saved < 0;
+ const budgetedSaved = useSheetValue(reportBudget.totalBudgetedSaved) || 0;
+ const totalSaved = useSheetValue(reportBudget.totalSaved) || 0;
+ const format = useFormat();
+ const saved = projected ? budgetedSaved : totalSaved;
+ const isNegative = saved < 0;
return (
@@ -39,7 +39,7 @@ export default function Saved({ projected, style }: SavedProps) {
{
if (!projected) {
- let diff = totalSaved - budgetedSaved;
+ const diff = totalSaved - budgetedSaved;
return (
{
+ const _onClose = () => {
tooltip.close();
onClose?.();
};
diff --git a/packages/desktop-client/src/components/budget/rollover/CoverTooltip.tsx b/packages/desktop-client/src/components/budget/rollover/CoverTooltip.tsx
index 9e24fcaf682..2605e5df23b 100644
--- a/packages/desktop-client/src/components/budget/rollover/CoverTooltip.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/CoverTooltip.tsx
@@ -22,7 +22,7 @@ export default function CoverTooltip({
categoryGroups = addToBeBudgetedGroup(
categoryGroups.filter(g => !g.is_income),
);
- let [category, setCategory] = useState(null);
+ const [category, setCategory] = useState(null);
function submit() {
if (category) {
diff --git a/packages/desktop-client/src/components/budget/rollover/RolloverComponents.tsx b/packages/desktop-client/src/components/budget/rollover/RolloverComponents.tsx
index 747770a7d86..e34a1322d2f 100644
--- a/packages/desktop-client/src/components/budget/rollover/RolloverComponents.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/RolloverComponents.tsx
@@ -20,7 +20,7 @@ import { makeAmountGrey } from '../util';
import BalanceTooltip from './BalanceTooltip';
-let headerLabelStyle: CSSProperties = {
+const headerLabelStyle: CSSProperties = {
flex: 1,
padding: '0 5px',
textAlign: 'right',
@@ -89,7 +89,7 @@ type ExpenseGroupMonthProps = {
export const ExpenseGroupMonth = memo(function ExpenseGroupMonth({
group,
}: ExpenseGroupMonthProps) {
- let { id } = group;
+ const { id } = group;
return (
@@ -152,7 +152,7 @@ export const ExpenseCategoryMonth = memo(function ExpenseCategoryMonth({
onBudgetAction,
onShowActivity,
}: ExpenseCategoryMonthProps) {
- let balanceTooltip = useTooltip();
+ const balanceTooltip = useTooltip();
const [menuOpen, setMenuOpen] = useState(false);
const [hover, setHover] = useState(false);
const isGoalTemplatesEnabled = useFeatureFlag('goalTemplatesEnabled');
diff --git a/packages/desktop-client/src/components/budget/rollover/RolloverContext.tsx b/packages/desktop-client/src/components/budget/rollover/RolloverContext.tsx
index 706999c7cbb..3d825c834e2 100644
--- a/packages/desktop-client/src/components/budget/rollover/RolloverContext.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/RolloverContext.tsx
@@ -2,7 +2,7 @@ import React, { type ReactNode, createContext, useContext } from 'react';
import * as monthUtils from 'loot-core/src/shared/months';
-let Context = createContext(null);
+const Context = createContext(null);
type RolloverContextProps = {
categoryGroups: unknown[];
@@ -18,7 +18,7 @@ export function RolloverContext({
onToggleSummaryCollapse,
children,
}: RolloverContextProps) {
- let currentMonth = monthUtils.currentMonth();
+ const currentMonth = monthUtils.currentMonth();
return (
+ >
+ {children}
+
);
}
diff --git a/packages/desktop-client/src/components/budget/rollover/TransferTooltip.tsx b/packages/desktop-client/src/components/budget/rollover/TransferTooltip.tsx
index 4aa10527c9e..5e7c382165b 100644
--- a/packages/desktop-client/src/components/budget/rollover/TransferTooltip.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/TransferTooltip.tsx
@@ -34,8 +34,8 @@ export default function TransferTooltip({
position = 'bottom-right',
...props
}: TransferTooltipProps) {
- let spreadsheet = useSpreadsheet();
- let sheetName = useContext(NamespaceContext);
+ const spreadsheet = useSpreadsheet();
+ const sheetName = useContext(NamespaceContext);
let { grouped: categoryGroups } = useCategories();
categoryGroups = categoryGroups.filter(g => !g.is_income);
@@ -43,8 +43,8 @@ export default function TransferTooltip({
categoryGroups = addToBeBudgetedGroup(categoryGroups);
}
- let [amount, setAmount] = useState(null);
- let [category, setCategory] = useState(null);
+ const [amount, setAmount] = useState(null);
+ const [category, setCategory] = useState(null);
useEffect(() => {
(async () => {
@@ -58,7 +58,7 @@ export default function TransferTooltip({
}, []);
function submit() {
- let parsedAmount = evalArithmetic(amount, null);
+ const parsedAmount = evalArithmetic(amount, null);
if (parsedAmount && category) {
onSubmit(amountToInteger(parsedAmount), category);
onClose();
diff --git a/packages/desktop-client/src/components/budget/rollover/budgetsummary/BudgetSummary.tsx b/packages/desktop-client/src/components/budget/rollover/budgetsummary/BudgetSummary.tsx
index 5cbf8f57343..0a5c73b9c7a 100644
--- a/packages/desktop-client/src/components/budget/rollover/budgetsummary/BudgetSummary.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/budgetsummary/BudgetSummary.tsx
@@ -27,14 +27,14 @@ export default function BudgetSummary({
month,
isGoalTemplatesEnabled,
}: BudgetSummaryProps) {
- let {
+ const {
currentMonth,
summaryCollapsed: collapsed,
onBudgetAction,
onToggleSummaryCollapse,
} = useRollover();
- let [menuOpen, setMenuOpen] = useState(false);
+ const [menuOpen, setMenuOpen] = useState(false);
function onMenuOpen(e) {
setMenuOpen(true);
}
@@ -43,9 +43,9 @@ export default function BudgetSummary({
setMenuOpen(false);
}
- let prevMonthName = monthUtils.format(monthUtils.prevMonth(month), 'MMM');
+ const prevMonthName = monthUtils.format(monthUtils.prevMonth(month), 'MMM');
- let ExpandOrCollapseIcon = collapsed ? ArrowButtonDown1 : ArrowButtonUp1;
+ const ExpandOrCollapseIcon = collapsed ? ArrowButtonDown1 : ArrowButtonUp1;
return (
diff --git a/packages/desktop-client/src/components/budget/rollover/budgetsummary/TotalsList.tsx b/packages/desktop-client/src/components/budget/rollover/budgetsummary/TotalsList.tsx
index 0805b8bacf0..20a5fd4b9cf 100644
--- a/packages/desktop-client/src/components/budget/rollover/budgetsummary/TotalsList.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/budgetsummary/TotalsList.tsx
@@ -75,7 +75,7 @@ export default function TotalsList({ prevMonthName, style }: TotalsListProps) {
binding={rolloverBudget.lastMonthOverspent}
type="financial"
formatter={value => {
- let v = format(value, 'financial');
+ const v = format(value, 'financial');
return value > 0 ? '+' + v : value === 0 ? '-' + v : v;
}}
style={{ fontWeight: 600, ...styles.tnum }}
@@ -85,7 +85,7 @@ export default function TotalsList({ prevMonthName, style }: TotalsListProps) {
binding={rolloverBudget.totalBudgeted}
type="financial"
formatter={value => {
- let v = format(value, 'financial');
+ const v = format(value, 'financial');
return value > 0 ? '+' + v : value === 0 ? '-' + v : v;
}}
style={{ fontWeight: 600, ...styles.tnum }}
@@ -95,8 +95,8 @@ export default function TotalsList({ prevMonthName, style }: TotalsListProps) {
binding={rolloverBudget.forNextMonth}
type="financial"
formatter={value => {
- let n = parseInt(value) || 0;
- let v = format(Math.abs(n), 'financial');
+ const n = parseInt(value) || 0;
+ const v = format(Math.abs(n), 'financial');
return n >= 0 ? '-' + v : '+' + v;
}}
style={{ fontWeight: 600, ...styles.tnum }}
diff --git a/packages/desktop-client/src/components/budget/util.ts b/packages/desktop-client/src/components/budget/util.ts
index 6e9f7dd1427..b1e7d7d5c24 100644
--- a/packages/desktop-client/src/components/budget/util.ts
+++ b/packages/desktop-client/src/components/budget/util.ts
@@ -85,13 +85,13 @@ export function findSortDown(
if (pos === 'top') {
return { targetId };
} else {
- let idx = arr.findIndex(item => item.id === targetId);
+ const idx = arr.findIndex(item => item.id === targetId);
if (idx === -1) {
throw new Error('findSort: item not found: ' + targetId);
}
- let newIdx = idx + 1;
+ const newIdx = idx + 1;
if (newIdx < arr.length - 1) {
return { targetId: arr[newIdx].id };
} else {
@@ -109,13 +109,13 @@ export function findSortUp(
if (pos === 'bottom') {
return { targetId };
} else {
- let idx = arr.findIndex(item => item.id === targetId);
+ const idx = arr.findIndex(item => item.id === targetId);
if (idx === -1) {
throw new Error('findSort: item not found: ' + targetId);
}
- let newIdx = idx - 1;
+ const newIdx = idx - 1;
if (newIdx >= 0) {
return { targetId: arr[newIdx].id };
} else {
@@ -134,12 +134,12 @@ export async function prewarmMonth(
spreadsheet: ReturnType,
month: string,
) {
- let method: keyof Handlers =
+ const method: keyof Handlers =
budgetType === 'report' ? 'report-budget-month' : 'rollover-budget-month';
- let values = await send(method, { month });
+ const values = await send(method, { month });
- for (let value of values) {
+ for (const value of values) {
spreadsheet.prewarmCache(value.name, value);
}
}
@@ -150,14 +150,14 @@ export async function prewarmAllMonths(
bounds: { start: string; end: string },
startMonth: string,
) {
- let numMonths = 3;
+ const numMonths = 3;
bounds = getValidMonthBounds(
bounds,
monthUtils.subMonths(startMonth, 1),
monthUtils.addMonths(startMonth, numMonths + 1),
);
- let months = monthUtils.rangeInclusive(bounds.start, bounds.end);
+ const months = monthUtils.rangeInclusive(bounds.start, bounds.end);
await Promise.all(
months.map(month => prewarmMonth(budgetType, spreadsheet, month)),
diff --git a/packages/desktop-client/src/components/common/AnchorLink.tsx b/packages/desktop-client/src/components/common/AnchorLink.tsx
index c1ea4749385..2cc6ba3fd01 100644
--- a/packages/desktop-client/src/components/common/AnchorLink.tsx
+++ b/packages/desktop-client/src/components/common/AnchorLink.tsx
@@ -18,7 +18,7 @@ export default function AnchorLink({
activeStyle,
children,
}: AnchorLinkProps) {
- let match = useMatch({ path: to });
+ const match = useMatch({ path: to });
return (
(
},
ref,
) => {
- let typeWithDisabled = disabled ? type + 'Disabled' : type;
+ const typeWithDisabled = disabled ? type + 'Disabled' : type;
hoveredStyle = {
...(type !== 'bare' && styles.shadow),
@@ -163,8 +163,8 @@ const Button = forwardRef(
...activeStyle,
};
- let Component = as;
- let buttonStyle = {
+ const Component = as;
+ const buttonStyle = {
alignItems: 'center',
justifyContent: 'center',
flexShrink: 0,
@@ -211,7 +211,7 @@ export const ButtonWithLoading = forwardRef<
HTMLButtonElement,
ButtonWithLoadingProps
>((props, ref) => {
- let { loading, children, ...buttonProps } = props;
+ const { loading, children, ...buttonProps } = props;
return (
+ // }
+ onClick={() => this.onClick(transaction.id, 'category')}
+ data-testid="category-field"
+ />
+ ) : (
+
+ Split transaction editing is not supported on mobile at this
+ time.
+
+ )}
+
+
+
+
+ this.onClick(transaction.id, 'account')}
+ data-testid="account-field"
+ />
+
+
+
+
+
+
+ this.onEdit(
+ transaction,
+ 'date',
+ formatDate(parseISO(value), this.props.dateFormat),
+ )
+ }
+ onChange={e =>
+ this.onQueueChange(
+ transaction,
+ 'date',
+ formatDate(parseISO(e.target.value), this.props.dateFormat),
+ )
+ }
+ />
+
+ {transaction.reconciled ? (
+
+
+
+
+ ) : (
+
+
+
+ this.onEdit(transaction, 'cleared', checked)
+ }
+ style={{
+ margin: 'auto',
+ width: 22,
+ height: 22,
+ }}
+ />
+
+ )}
+
+
+
+
+ this.onEdit(transaction, 'notes', value)}
+ onChange={e =>
+ this.onQueueChange(transaction, 'notes', e.target.value)
+ }
+ />
+
+
+ {!adding && (
+
+
+
+ )}
-
- //
+
);
}
}
@@ -794,9 +652,9 @@ function makeTemporaryTransactions(currentAccountId, lastDate) {
function TransactionEditUnconnected(props) {
const { categories, accounts, payees, lastTransaction, dateFormat } = props;
- let { id: accountId, transactionId } = useParams();
- let navigate = useNavigate();
- let [fetchedTransactions, setFetchedTransactions] = useState(null);
+ const { id: accountId, transactionId } = useParams();
+ const navigate = useNavigate();
+ const [fetchedTransactions, setFetchedTransactions] = useState(null);
let transactions = [];
let adding = false;
let deleted = false;
@@ -820,7 +678,7 @@ function TransactionEditUnconnected(props) {
// The edit item components expect to work with a flat array of
// transactions when handling splits, so we call ungroupTransactions to
// flatten parent and children into one array.
- let { data } = await runQuery(
+ const { data } = await runQuery(
q('transactions')
.filter({ id: transactionId })
.select('*')
@@ -855,10 +713,10 @@ function TransactionEditUnconnected(props) {
// Run the rules to auto-fill in any data. Right now we only do
// this on new transactions because that's how desktop works.
if (isTemporary(transaction)) {
- let afterRules = await send('rules-run', { transaction });
- let diff = getChangedValues(transaction, afterRules);
+ const afterRules = await send('rules-run', { transaction });
+ const diff = getChangedValues(transaction, afterRules);
- let newTransaction = { ...transaction };
+ const newTransaction = { ...transaction };
if (diff) {
Object.keys(diff).forEach(field => {
if (newTransaction[field] == null) {
@@ -981,10 +839,10 @@ class Transaction extends PureComponent {
onSelect,
style,
} = this.props;
- let {
+ const {
id,
payee: payeeId,
- amount,
+ amount: originalAmount,
category,
cleared,
is_parent,
@@ -992,32 +850,33 @@ class Transaction extends PureComponent {
schedule,
} = transaction;
+ let amount = originalAmount;
if (isPreviewId(id)) {
amount = getScheduledAmount(amount);
}
- let categoryName = lookupName(categories, category);
+ const categoryName = lookupName(categories, category);
- let payee = payees && payeeId && getPayeesById(payees)[payeeId];
- let transferAcct =
+ const payee = payees && payeeId && getPayeesById(payees)[payeeId];
+ const transferAcct =
payee &&
payee.transfer_acct &&
getAccountsById(accounts)[payee.transfer_acct];
- let prettyDescription = getDescriptionPretty(
+ const prettyDescription = getDescriptionPretty(
transaction,
payee,
transferAcct,
);
- let prettyCategory = transferAcct
+ const prettyCategory = transferAcct
? 'Transfer'
: is_parent
? 'Split'
: categoryName;
- let isPreview = isPreviewId(id);
- let isReconciled = transaction.reconciled;
- let textStyle = isPreview && {
+ const isPreview = isPreviewId(id);
+ const isReconciled = transaction.reconciled;
+ const textStyle = isPreview && {
fontStyle: 'italic',
color: theme.pageTextLight,
};
@@ -1147,9 +1006,9 @@ export class TransactionList extends Component {
) {
// Mark the last transaction in the section so it can render
// with a different border
- let lastSection = sections[sections.length - 1];
+ const lastSection = sections[sections.length - 1];
if (lastSection && lastSection.data.length > 0) {
- let lastData = lastSection.data;
+ const lastData = lastSection.data;
lastData[lastData.length - 1].isLast = true;
}
@@ -1242,9 +1101,9 @@ export class TransactionList extends Component {
}
function ListBox(props) {
- let state = useListState(props);
- let listBoxRef = useRef();
- let { listBoxProps, labelProps } = useListBox(props, state, listBoxRef);
+ const state = useListState(props);
+ const listBoxRef = useRef();
+ const { listBoxProps, labelProps } = useListBox(props, state, listBoxRef);
useEffect(() => {
function loadMoreTransactions() {
@@ -1288,7 +1147,7 @@ function ListBox(props) {
}
function ListBoxSection({ section, state }) {
- let { itemProps, headingProps, groupProps } = useListBoxSection({
+ const { itemProps, headingProps, groupProps } = useListBoxSection({
heading: section.rendered,
'aria-label': section['aria-label'],
});
@@ -1340,12 +1199,12 @@ function ListBoxSection({ section, state }) {
function Option({ isLast, item, state }) {
// Get props for the option element
- let ref = useRef();
- let { optionProps, isSelected } = useOption({ key: item.key }, state, ref);
+ const ref = useRef();
+ const { optionProps, isSelected } = useOption({ key: item.key }, state, ref);
// Determine whether we should show a keyboard
// focus ring for accessibility
- let { isFocusVisible, focusProps } = useFocusRing();
+ const { isFocusVisible, focusProps } = useFocusRing();
return (
{
- let items = [...selectedItems];
+ const types = useMemo(() => {
+ const items = [...selectedItems];
return {
preview: !!items.find(id => isPreviewId(id)),
trans: !!items.find(id => !isPreviewId(id)),
};
}, [selectedItems]);
- let ambiguousDuplication = useMemo(() => {
- let transactions = [...selectedItems].map(id => getTransaction(id));
+ const ambiguousDuplication = useMemo(() => {
+ const transactions = [...selectedItems].map(id => getTransaction(id));
return transactions.some(t => t && t.is_child);
}, [selectedItems]);
- let linked = useMemo(() => {
+ const linked = useMemo(() => {
return (
!types.preview &&
[...selectedItems].every(id => {
- let t = getTransaction(id);
+ const t = getTransaction(id);
return t && t.schedule;
})
);
@@ -118,13 +118,13 @@ export function SelectedTransactionsButton({
onScheduleAction(name, selectedItems);
break;
case 'view-schedule':
- let firstId = [...selectedItems][0];
+ const firstId = [...selectedItems][0];
let scheduleId;
if (isPreviewId(firstId)) {
- let parts = firstId.split('/');
+ const parts = firstId.split('/');
scheduleId = parts[1];
} else {
- let trans = getTransaction(firstId);
+ const trans = getTransaction(firstId);
scheduleId = trans && trans.schedule;
}
diff --git a/packages/desktop-client/src/components/transactions/SimpleTransactionsTable.js b/packages/desktop-client/src/components/transactions/SimpleTransactionsTable.js
index 076a682c5ed..16d99dce3ae 100644
--- a/packages/desktop-client/src/components/transactions/SimpleTransactionsTable.js
+++ b/packages/desktop-client/src/components/transactions/SimpleTransactionsTable.js
@@ -42,10 +42,10 @@ const TransactionRow = memo(function TransactionRow({
selected,
}) {
// TODO: Convert these to use fetched queries
- let c = getCategoriesById(categories)[transaction.category];
- let a = getAccountsById(accounts)[transaction.account];
+ const c = getCategoriesById(categories)[transaction.category];
+ const a = getAccountsById(accounts)[transaction.account];
- let dispatchSelected = useSelectedDispatch();
+ const dispatchSelected = useSelectedDispatch();
return (
@@ -142,23 +142,23 @@ export default function SimpleTransactionsTable({
fields = ['date', 'payee', 'amount'],
style,
}) {
- let { grouped: categories } = useCategories();
- let { payees, accounts, dateFormat } = useSelector(state => {
+ const { grouped: categories } = useCategories();
+ const { payees, accounts, dateFormat } = useSelector(state => {
return {
payees: state.queries.payees,
accounts: state.queries.accounts,
dateFormat: state.prefs.local.dateFormat || 'MM/dd/yyyy',
};
});
- let selectedItems = useSelectedItems();
- let dispatchSelected = useSelectedDispatch();
- let memoFields = useMemo(() => fields, [JSON.stringify(fields)]);
+ const selectedItems = useSelectedItems();
+ const dispatchSelected = useSelectedDispatch();
+ const memoFields = useMemo(() => fields, [JSON.stringify(fields)]);
- let serializedTransactions = useMemo(() => {
+ const serializedTransactions = useMemo(() => {
return transactions.map(trans => serializeTransaction(trans, dateFormat));
}, [transactions]);
- let renderItem = useCallback(
+ const renderItem = useCallback(
({ item }) => {
return (
{
transactionsLatest.current = transactions;
}, [transactions]);
- let onAdd = useCallback(async newTransactions => {
+ const onAdd = useCallback(async newTransactions => {
newTransactions = realizeTempTransactions(newTransactions);
await saveDiff({ added: newTransactions });
onRefetch();
}, []);
- let onSave = useCallback(async transaction => {
- let changes = updateTransaction(transactionsLatest.current, transaction);
+ const onSave = useCallback(async transaction => {
+ const changes = updateTransaction(transactionsLatest.current, transaction);
if (changes.diff.updated.length > 0) {
- let dateChanged = !!changes.diff.updated[0].date;
+ const dateChanged = !!changes.diff.updated[0].date;
if (dateChanged) {
// Make sure it stays at the top of the list of transactions
// for that date
@@ -118,25 +118,25 @@ export default function TransactionList({
}
}, []);
- let onAddSplit = useCallback(id => {
+ const onAddSplit = useCallback(id => {
const changes = addSplitTransaction(transactionsLatest.current, id);
onChange(changes.newTransaction, changes.data);
saveDiffAndApply(changes.diff, changes, onChange);
return changes.diff.added[0].id;
}, []);
- let onSplit = useCallback(id => {
+ const onSplit = useCallback(id => {
const changes = splitTransaction(transactionsLatest.current, id);
onChange(changes.newTransaction, changes.data);
saveDiffAndApply(changes.diff, changes, onChange);
return changes.diff.added[0].id;
}, []);
- let onApplyRules = useCallback(async transaction => {
- let afterRules = await send('rules-run', { transaction });
- let diff = getChangedValues(transaction, afterRules);
+ const onApplyRules = useCallback(async transaction => {
+ const afterRules = await send('rules-run', { transaction });
+ const diff = getChangedValues(transaction, afterRules);
- let newTransaction = { ...transaction };
+ const newTransaction = { ...transaction };
if (diff) {
Object.keys(diff).forEach(field => {
if (
@@ -152,15 +152,15 @@ export default function TransactionList({
return newTransaction;
}, []);
- let onManagePayees = useCallback(id => {
+ const onManagePayees = useCallback(id => {
navigate('/payees', { selectedPayee: id });
});
- let onNavigateToTransferAccount = useCallback(accountId => {
+ const onNavigateToTransferAccount = useCallback(accountId => {
navigate(`/accounts/${accountId}`);
});
- let onNavigateToSchedule = useCallback(scheduleId => {
+ const onNavigateToSchedule = useCallback(scheduleId => {
pushModal('schedule-edit', { id: scheduleId });
});
diff --git a/packages/desktop-client/src/components/transactions/TransactionsTable.js b/packages/desktop-client/src/components/transactions/TransactionsTable.js
index 4710d7d89ed..26b9f2361dc 100644
--- a/packages/desktop-client/src/components/transactions/TransactionsTable.js
+++ b/packages/desktop-client/src/components/transactions/TransactionsTable.js
@@ -117,11 +117,11 @@ function serializeTransaction(transaction, showZeroInDeposit) {
}
function deserializeTransaction(transaction, originalTransaction) {
- let { debit, credit, date, ...realTransaction } = transaction;
+ const { debit, credit, date: originalDate, ...realTransaction } = transaction;
let amount;
if (debit !== '') {
- let parsed = evalArithmetic(debit, null);
+ const parsed = evalArithmetic(debit, null);
amount = parsed != null ? -parsed : null;
} else {
amount = evalArithmetic(credit, null);
@@ -130,6 +130,7 @@ function deserializeTransaction(transaction, originalTransaction) {
amount =
amount != null ? amountToInteger(amount) : originalTransaction.amount;
+ let date = originalDate;
if (date == null) {
date = originalTransaction.date || currentDay();
}
@@ -138,7 +139,7 @@ function deserializeTransaction(transaction, originalTransaction) {
}
function isLastChild(transactions, index) {
- let trans = transactions[index];
+ const trans = transactions[index];
return (
trans &&
trans.is_child &&
@@ -147,10 +148,10 @@ function isLastChild(transactions, index) {
);
}
-let SplitsExpandedContext = createContext(null);
+const SplitsExpandedContext = createContext(null);
export function useSplitsExpanded() {
- let data = useContext(SplitsExpandedContext);
+ const data = useContext(SplitsExpandedContext);
return useMemo(
() => ({
@@ -165,14 +166,14 @@ export function useSplitsExpanded() {
}
export function SplitsExpandedProvider({ children, initialMode = 'expand' }) {
- let cachedState = useSelector(state => state.app.lastSplitState);
- let reduxDispatch = useDispatch();
+ const cachedState = useSelector(state => state.app.lastSplitState);
+ const reduxDispatch = useDispatch();
- let [state, dispatch] = useReducer((state, action) => {
+ const [state, dispatch] = useReducer((state, action) => {
switch (action.type) {
case 'toggle-split': {
- let ids = new Set([...state.ids]);
- let { id } = action;
+ const ids = new Set([...state.ids]);
+ const { id } = action;
if (ids.has(id)) {
ids.delete(id);
} else {
@@ -181,8 +182,8 @@ export function SplitsExpandedProvider({ children, initialMode = 'expand' }) {
return { ...state, ids };
}
case 'open-split': {
- let ids = new Set([...state.ids]);
- let { id } = action;
+ const ids = new Set([...state.ids]);
+ const { id } = action;
if (state.mode === 'collapse') {
ids.delete(id);
} else {
@@ -233,7 +234,7 @@ export function SplitsExpandedProvider({ children, initialMode = 'expand' }) {
}
}, [state]);
- let value = useMemo(() => ({ state, dispatch }), [state, dispatch]);
+ const value = useMemo(() => ({ state, dispatch }), [state, dispatch]);
return (
@@ -262,7 +263,7 @@ const TransactionHeader = memo(
ascDesc,
field,
}) => {
- let dispatchSelected = useSelectedDispatch();
+ const dispatchSelected = useSelectedDispatch();
return (
account.id !== accountId);
@@ -556,7 +557,7 @@ function PayeeCell({
if (value && value.startsWith('new:') && !isCreatingPayee.current) {
isCreatingPayee.current = true;
- let id = await onCreatePayee(value.slice('new:'.length));
+ const id = await onCreatePayee(value.slice('new:'.length));
onUpdate('payee', id);
isCreatingPayee.current = false;
}
@@ -617,9 +618,9 @@ function PayeeIcons({
onNavigateToSchedule,
children,
}) {
- let scheduleId = transaction.schedule;
- let scheduleData = useCachedSchedules();
- let schedule = scheduleData
+ const scheduleId = transaction.schedule;
+ const scheduleData = useCachedSchedules();
+ const schedule = scheduleData
? scheduleData.schedules.find(s => s.id === scheduleId)
: null;
@@ -628,7 +629,7 @@ function PayeeIcons({
return children;
}
- let buttonStyle = {
+ const buttonStyle = {
marginLeft: -5,
marginRight: 2,
width: 23,
@@ -636,11 +637,11 @@ function PayeeIcons({
color: 'inherit',
};
- let scheduleIconStyle = { width: 13, height: 13 };
+ const scheduleIconStyle = { width: 13, height: 13 };
- let transferIconStyle = { width: 10, height: 10 };
+ const transferIconStyle = { width: 10, height: 10 };
- let recurring = schedule && schedule._date && !!schedule._date.frequency;
+ const recurring = schedule && schedule._date && !!schedule._date.frequency;
return (
<>
@@ -684,7 +685,7 @@ function PayeeIcons({
}
const Transaction = memo(function Transaction(props) {
- let {
+ const {
transaction: originalTransaction,
editing,
showAccount,
@@ -716,14 +717,14 @@ const Transaction = memo(function Transaction(props) {
onNavigateToSchedule,
} = props;
- let dispatchSelected = useSelectedDispatch();
+ const dispatchSelected = useSelectedDispatch();
- let [prevShowZero, setPrevShowZero] = useState(showZeroInDeposit);
- let [prevTransaction, setPrevTransaction] = useState(originalTransaction);
- let [transaction, setTransaction] = useState(() =>
+ const [prevShowZero, setPrevShowZero] = useState(showZeroInDeposit);
+ const [prevTransaction, setPrevTransaction] = useState(originalTransaction);
+ const [transaction, setTransaction] = useState(() =>
serializeTransaction(originalTransaction, showZeroInDeposit),
);
- let isPreview = isPreviewId(transaction.id);
+ const isPreview = isPreviewId(transaction.id);
if (
originalTransaction !== prevTransaction ||
@@ -736,7 +737,7 @@ const Transaction = memo(function Transaction(props) {
setPrevShowZero(showZeroInDeposit);
}
- let [showReconciliationWarning, setShowReconciliationWarning] =
+ const [showReconciliationWarning, setShowReconciliationWarning] =
useState(false);
function onUpdate(name, value) {
@@ -772,7 +773,7 @@ const Transaction = memo(function Transaction(props) {
}
function onUpdateAfterConfirm(name, value) {
- let newTransaction = { ...transaction, [name]: value };
+ const newTransaction = { ...transaction, [name]: value };
// Don't change the note to an empty string if it's null (since they are both rendered the same)
if (name === 'note' && value === '' && transaction.note == null) {
@@ -806,7 +807,7 @@ const Transaction = memo(function Transaction(props) {
if (name === 'payee' && value && value.startsWith('new:')) {
setTransaction(newTransaction);
} else {
- let deserialized = deserializeTransaction(
+ const deserialized = deserializeTransaction(
newTransaction,
originalTransaction,
);
@@ -817,7 +818,7 @@ const Transaction = memo(function Transaction(props) {
}
}
- let {
+ const {
id,
amount,
debit,
@@ -836,8 +837,8 @@ const Transaction = memo(function Transaction(props) {
} = transaction;
// Join in some data
- let payee = payees && payeeId && getPayeesById(payees)[payeeId];
- let account = accounts && accountId && getAccountsById(accounts)[accountId];
+ const payee = payees && payeeId && getPayeesById(payees)[payeeId];
+ const account = accounts && accountId && getAccountsById(accounts)[accountId];
let transferAcct;
if (_inverse) {
@@ -850,15 +851,15 @@ const Transaction = memo(function Transaction(props) {
getAccountsById(accounts)[payee.transfer_acct];
}
- let isChild = transaction.is_child;
- let isBudgetTransfer = transferAcct && transferAcct.offbudget === 0;
- let isOffBudget = account && account.offbudget === 1;
+ const isChild = transaction.is_child;
+ const isBudgetTransfer = transferAcct && transferAcct.offbudget === 0;
+ const isOffBudget = account && account.offbudget === 1;
- let valueStyle = added ? { fontWeight: 600 } : null;
- let backgroundFocus = focusedField === 'select';
- let amountStyle = hideFraction ? { letterSpacing: -0.5 } : null;
+ const valueStyle = added ? { fontWeight: 600 } : null;
+ const backgroundFocus = focusedField === 'select';
+ const amountStyle = hideFraction ? { letterSpacing: -0.5 } : null;
- let runningBalance = !isTemporaryId(id)
+ const runningBalance = !isTemporaryId(id)
? balance
: balance + (_inverse ? -1 : 1) * amount;
@@ -993,7 +994,7 @@ const Transaction = memo(function Transaction(props) {
textAlign="flex"
value={accountId}
formatter={acctId => {
- let acct = acctId && getAccountsById(accounts)[acctId];
+ const acct = acctId && getAccountsById(accounts)[acctId];
if (acct) {
return acct.name;
}
@@ -1532,15 +1533,15 @@ function TransactionTableInner({
}) {
const containerRef = createRef();
const isAddingPrev = usePrevious(props.isAdding);
- let [scrollWidth, setScrollWidth] = useState(0);
+ const [scrollWidth, setScrollWidth] = useState(0);
function saveScrollWidth(parent, child) {
- let width = parent > 0 && child > 0 && parent - child;
+ const width = parent > 0 && child > 0 && parent - child;
setScrollWidth(!width ? 0 : width);
}
- let onNavigateToTransferAccount = useCallback(
+ const onNavigateToTransferAccount = useCallback(
accountId => {
props.onCloseAddTransaction();
props.onNavigateToTransferAccount(accountId);
@@ -1548,7 +1549,7 @@ function TransactionTableInner({
[props.onCloseAddTransaction, props.onNavigateToTransferAccount],
);
- let onNavigateToSchedule = useCallback(
+ const onNavigateToSchedule = useCallback(
scheduleId => {
props.onCloseAddTransaction();
props.onNavigateToSchedule(scheduleId);
@@ -1580,17 +1581,17 @@ function TransactionTableInner({
isExpanded,
} = props;
- let trans = item;
- let selected = selectedItems.has(trans.id);
+ const trans = item;
+ const selected = selectedItems.has(trans.id);
- let parent = props.transactionMap.get(trans.parent_id);
- let isChildDeposit = parent && parent.amount > 0;
- let expanded = isExpanded && isExpanded((parent || trans).id);
+ const parent = props.transactionMap.get(trans.parent_id);
+ const isChildDeposit = parent && parent.amount > 0;
+ const expanded = isExpanded && isExpanded((parent || trans).id);
// For backwards compatibility, read the error of the transaction
// since in previous versions we stored it there. In the future we
// can simplify this to just the parent
- let error = expanded
+ const error = expanded
? (parent && parent.error) || trans.error
: trans.error;
@@ -1751,19 +1752,19 @@ function TransactionTableInner({
);
}
-export let TransactionTable = forwardRef((props, ref) => {
- let [newTransactions, setNewTransactions] = useState(null);
- let [prevIsAdding, setPrevIsAdding] = useState(false);
- let splitsExpanded = useSplitsExpanded();
- let prevSplitsExpanded = useRef(null);
+export const TransactionTable = forwardRef((props, ref) => {
+ const [newTransactions, setNewTransactions] = useState(null);
+ const [prevIsAdding, setPrevIsAdding] = useState(false);
+ const splitsExpanded = useSplitsExpanded();
+ const prevSplitsExpanded = useRef(null);
- let tableRef = useRef(null);
- let mergedRef = useMergedRefs(tableRef, ref);
+ const tableRef = useRef(null);
+ const mergedRef = useMergedRefs(tableRef, ref);
- let transactions = useMemo(() => {
+ const transactions = useMemo(() => {
let result;
if (splitsExpanded.state.transitionId != null) {
- let index = props.transactions.findIndex(
+ const index = props.transactions.findIndex(
t => t.id === splitsExpanded.state.transitionId,
);
result = props.transactions.filter((t, idx) => {
@@ -1811,14 +1812,14 @@ export let TransactionTable = forwardRef((props, ref) => {
}
}, [prevSplitsExpanded.current]);
- let newNavigator = useTableNavigator(newTransactions, getFields);
- let tableNavigator = useTableNavigator(transactions, getFields);
- let shouldAdd = useRef(false);
- let latestState = useRef({ newTransactions, newNavigator, tableNavigator });
- let savePending = useRef(false);
- let afterSaveFunc = useRef(false);
- let [_, forceRerender] = useState({});
- let selectedItems = useSelectedItems();
+ const newNavigator = useTableNavigator(newTransactions, getFields);
+ const tableNavigator = useTableNavigator(transactions, getFields);
+ const shouldAdd = useRef(false);
+ const latestState = useRef({ newTransactions, newNavigator, tableNavigator });
+ const savePending = useRef(false);
+ const afterSaveFunc = useRef(false);
+ const [_, forceRerender] = useState({});
+ const selectedItems = useSelectedItems();
useLayoutEffect(() => {
latestState.current = {
@@ -1851,8 +1852,8 @@ export let TransactionTable = forwardRef((props, ref) => {
});
newNavigator.onEdit('temp', 'account');
} else {
- let transactions = latestState.current.newTransactions;
- let lastDate = transactions.length > 0 ? transactions[0].date : null;
+ const transactions = latestState.current.newTransactions;
+ const lastDate = transactions.length > 0 ? transactions[0].date : null;
setNewTransactions(
makeTemporaryTransactions(
props.currentAccountId,
@@ -1924,7 +1925,7 @@ export let TransactionTable = forwardRef((props, ref) => {
onAddTemporary();
} else if (!e.shiftKey) {
function getLastTransaction(state) {
- let { newTransactions } = state.current;
+ const { newTransactions } = state.current;
return newTransactions[newTransactions.length - 1];
}
@@ -1938,8 +1939,9 @@ export let TransactionTable = forwardRef((props, ref) => {
}
afterSave(() => {
- let lastTransaction = getLastTransaction(latestState);
- let isSplit = lastTransaction.parent_id || lastTransaction.is_parent;
+ const lastTransaction = getLastTransaction(latestState);
+ const isSplit =
+ lastTransaction.parent_id || lastTransaction.is_parent;
if (
latestState.current.newTransactions[0].error &&
@@ -1960,12 +1962,12 @@ export let TransactionTable = forwardRef((props, ref) => {
function onCheckEnter(e) {
if (e.key === 'Enter' && !e.shiftKey) {
- let { editingId: id, focusedField } = tableNavigator;
+ const { editingId: id, focusedField } = tableNavigator;
afterSave(() => {
- let transactions = latestState.current.transactions;
- let idx = transactions.findIndex(t => t.id === id);
- let parent = transactionMap.get(transactions[idx]?.parent_id);
+ const transactions = latestState.current.transactions;
+ const idx = transactions.findIndex(t => t.id === id);
+ const parent = transactionMap.get(transactions[idx]?.parent_id);
if (
isLastChild(transactions, idx) &&
@@ -1980,7 +1982,7 @@ export let TransactionTable = forwardRef((props, ref) => {
}
}
- let onAddTemporary = useCallback(() => {
+ const onAddTemporary = useCallback(() => {
shouldAdd.current = true;
// A little hacky - this forces a rerender which will cause the
// effect we want to run. We have to wait for all updates to be
@@ -1988,7 +1990,7 @@ export let TransactionTable = forwardRef((props, ref) => {
forceRerender({});
}, [props.onAdd, newNavigator.onEdit]);
- let onSave = useCallback(
+ const onSave = useCallback(
async transaction => {
savePending.current = true;
@@ -1997,7 +1999,7 @@ export let TransactionTable = forwardRef((props, ref) => {
transaction = await props.onApplyRules(transaction);
}
- let newTrans = latestState.current.newTransactions;
+ const newTrans = latestState.current.newTransactions;
setNewTransactions(updateTransaction(newTrans, transaction).data);
} else {
props.onSave(transaction);
@@ -2006,11 +2008,11 @@ export let TransactionTable = forwardRef((props, ref) => {
[props.onSave],
);
- let onDelete = useCallback(id => {
- let temporary = isTemporaryId(id);
+ const onDelete = useCallback(id => {
+ const temporary = isTemporaryId(id);
if (temporary) {
- let newTrans = latestState.current.newTransactions;
+ const newTrans = latestState.current.newTransactions;
if (id === newTrans[0].id) {
// You can never delete the parent new transaction
@@ -2021,12 +2023,12 @@ export let TransactionTable = forwardRef((props, ref) => {
}
}, []);
- let onSplit = useMemo(() => {
+ const onSplit = useMemo(() => {
return id => {
if (isTemporaryId(id)) {
- let { newNavigator } = latestState.current;
- let newTrans = latestState.current.newTransactions;
- let { data, diff } = splitTransaction(newTrans, id);
+ const { newNavigator } = latestState.current;
+ const newTrans = latestState.current.newTransactions;
+ const { data, diff } = splitTransaction(newTrans, id);
setNewTransactions(data);
// Jump next to "debit" field if it is empty
@@ -2041,12 +2043,12 @@ export let TransactionTable = forwardRef((props, ref) => {
);
}
} else {
- let trans = latestState.current.transactions.find(t => t.id === id);
- let newId = props.onSplit(id);
+ const trans = latestState.current.transactions.find(t => t.id === id);
+ const newId = props.onSplit(id);
splitsExpanded.dispatch({ type: 'open-split', id: trans.id });
- let { tableNavigator } = latestState.current;
+ const { tableNavigator } = latestState.current;
if (trans.amount === null) {
tableNavigator.onEdit(trans.id, 'debit');
} else {
@@ -2056,18 +2058,18 @@ export let TransactionTable = forwardRef((props, ref) => {
};
}, [props.onSplit, splitsExpanded.dispatch]);
- let onAddSplit = useCallback(
+ const onAddSplit = useCallback(
id => {
if (isTemporaryId(id)) {
- let newTrans = latestState.current.newTransactions;
- let { data, diff } = addSplitTransaction(newTrans, id);
+ const newTrans = latestState.current.newTransactions;
+ const { data, diff } = addSplitTransaction(newTrans, id);
setNewTransactions(data);
newNavigator.onEdit(
diff.added[0].id,
latestState.current.newNavigator.focusedField,
);
} else {
- let newId = props.onAddSplit(id);
+ const newId = props.onAddSplit(id);
tableNavigator.onEdit(
newId,
latestState.current.tableNavigator.focusedField,
@@ -2087,7 +2089,7 @@ export let TransactionTable = forwardRef((props, ref) => {
props.onCloseAddTransaction();
}
- let onToggleSplit = useCallback(
+ const onToggleSplit = useCallback(
id => splitsExpanded.dispatch({ type: 'toggle-split', id }),
[splitsExpanded.dispatch],
);
diff --git a/packages/desktop-client/src/components/transactions/TransactionsTable.test.js b/packages/desktop-client/src/components/transactions/TransactionsTable.test.js
index edc14f7f190..b62d840267a 100644
--- a/packages/desktop-client/src/components/transactions/TransactionsTable.test.js
+++ b/packages/desktop-client/src/components/transactions/TransactionsTable.test.js
@@ -87,13 +87,13 @@ function LiveTransactionTable(props) {
}, [transactions]);
const onSplit = id => {
- let { data, diff } = splitTransaction(transactions, id);
+ const { data, diff } = splitTransaction(transactions, id);
setTransactions(data);
return diff.added[0].id;
};
const onSave = transaction => {
- let { data } = updateTransaction(transactions, transaction);
+ const { data } = updateTransaction(transactions, transaction);
setTransactions(data);
};
@@ -103,7 +103,7 @@ function LiveTransactionTable(props) {
};
const onAddSplit = id => {
- let { data, diff } = addSplitTransaction(transactions, id);
+ const { data, diff } = addSplitTransaction(transactions, id);
setTransactions(data);
return diff.added[0].id;
};
@@ -185,7 +185,7 @@ function renderTransactions(extraProps) {
// various this
transactions[0].amount = -2777;
- let defaultProps = {
+ const defaultProps = {
transactions,
payees,
accounts,
@@ -200,7 +200,7 @@ function renderTransactions(extraProps) {
},
};
- let result = render(
+ const result = render(
,
);
return {
@@ -236,17 +236,17 @@ function queryField(container, name, subSelector = '', idx) {
async function _editField(field, container) {
// We only short-circuit this for inputs
- let input = field.querySelector(`input`);
+ const input = field.querySelector(`input`);
if (input) {
expect(container.ownerDocument.activeElement).toBe(input);
return input;
}
let element;
- let buttonQuery = 'button,div[data-testid=cell-button]';
+ const buttonQuery = 'button,div[data-testid=cell-button]';
if (field.querySelector(buttonQuery)) {
- let btn = field.querySelector(buttonQuery);
+ const btn = field.querySelector(buttonQuery);
await userEvent.click(btn);
element = field.querySelector(':focus');
expect(element).toBeTruthy();
@@ -401,9 +401,9 @@ describe('Transactions', () => {
'{Shift>}[Enter]{/Shift}',
];
- for (let idx in ks) {
- let input = await editField(container, 'notes', 2);
- let oldValue = input.value;
+ for (const idx in ks) {
+ const input = await editField(container, 'notes', 2);
+ const oldValue = input.value;
await userEvent.clear(input);
await userEvent.type(input, 'a happy little note' + idx);
// It's not saved yet
@@ -416,8 +416,8 @@ describe('Transactions', () => {
);
}
- let input = await editField(container, 'notes', 2);
- let oldValue = input.value;
+ const input = await editField(container, 'notes', 2);
+ const oldValue = input.value;
await userEvent.clear(input);
await userEvent.type(input, 'another happy note');
// It's not saved yet
@@ -430,9 +430,9 @@ describe('Transactions', () => {
test('dropdown automatically opens and can be filtered', async () => {
const { container } = renderTransactions();
- let categories = categoryGroups.flatMap(group => group.categories);
- let input = await editField(container, 'category', 2);
- let tooltip = container.querySelector('[data-testid="autocomplete"]');
+ const categories = categoryGroups.flatMap(group => group.categories);
+ const input = await editField(container, 'category', 2);
+ const tooltip = container.querySelector('[data-testid="autocomplete"]');
expect(tooltip).toBeTruthy();
expect(
[...tooltip.querySelectorAll('[data-testid*="category-item"]')].length,
@@ -460,8 +460,8 @@ describe('Transactions', () => {
test('dropdown selects an item with keyboard', async () => {
const { container, getTransactions } = renderTransactions();
- let input = await editField(container, 'category', 2);
- let tooltip = container.querySelector('[data-testid="autocomplete"]');
+ const input = await editField(container, 'category', 2);
+ const tooltip = container.querySelector('[data-testid="autocomplete"]');
// No item should be highlighted
let highlighted = tooltip.querySelector('[data-highlighted]');
@@ -504,7 +504,7 @@ describe('Transactions', () => {
let tooltip = container.querySelector('[data-testid="autocomplete"]');
// Make sure none of the items are highlighted
- let items = tooltip.querySelectorAll('[data-testid$="category-item"]');
+ const items = tooltip.querySelectorAll('[data-testid$="category-item"]');
let highlighted = tooltip.querySelector('[data-highlighted]');
expect(highlighted).toBeNull();
@@ -535,18 +535,18 @@ describe('Transactions', () => {
test('dropdown hovers but doesn’t change value', async () => {
const { container, getTransactions } = renderTransactions();
- let input = await editField(container, 'category', 2);
- let oldCategory = getTransactions()[2].category;
- let tooltip = container.querySelector('[data-testid="autocomplete"]');
+ const input = await editField(container, 'category', 2);
+ const oldCategory = getTransactions()[2].category;
+ const tooltip = container.querySelector('[data-testid="autocomplete"]');
- let items = tooltip.querySelectorAll('[data-testid$="category-item"]');
+ const items = tooltip.querySelectorAll('[data-testid$="category-item"]');
// Hover over a few of the items to highlight them
await userEvent.hover(items[2]);
await userEvent.hover(items[3]);
// Make sure one of them is highlighted
- let highlighted = tooltip.querySelectorAll('[data-highlighted]');
+ const highlighted = tooltip.querySelectorAll('[data-highlighted]');
expect(highlighted).toHaveLength(1);
// Navigate away from the field with the keyboard
@@ -554,7 +554,7 @@ describe('Transactions', () => {
// Make sure the category didn't update, and that the highlighted
// field was different than the transactions' category
- let currentCategory = getTransactions()[2].category;
+ const currentCategory = getTransactions()[2].category;
expect(currentCategory).toBe(oldCategory);
expect(highlighted.textContent).not.toBe(
categories.find(c => c.id === currentCategory).name,
@@ -572,7 +572,7 @@ describe('Transactions', () => {
// For this first test case, make sure the tooltip is gone. We
// don't need to check this in all the other cases
- let tooltipItems = container.querySelectorAll(
+ const tooltipItems = container.querySelectorAll(
'[data-testid="category-item-group"]',
);
expect(tooltipItems.length).toBe(0);
@@ -604,13 +604,13 @@ describe('Transactions', () => {
test('dropdown escape resets the value ', async () => {
const { container } = renderTransactions();
- let input = await editField(container, 'category', 2);
- let oldValue = input.value;
+ const input = await editField(container, 'category', 2);
+ const oldValue = input.value;
await userEvent.type(input, 'aaabbbccc[Escape]');
expect(input.value).toBe(oldValue);
// The tooltip be closed
- let tooltip = container.querySelector('[data-testid="autocomplete"]');
+ const tooltip = container.querySelector('[data-testid="autocomplete"]');
expect(tooltip).toBeNull();
});
@@ -659,7 +659,7 @@ describe('Transactions', () => {
await userEvent.type(input, '55.00');
await editNewField(container, 'category');
- let splitButton = document.body.querySelector(
+ const splitButton = document.body.querySelector(
'[data-testid="autocomplete"] [data-testid="split-transaction-button"]',
);
await userEvent.click(splitButton);
@@ -686,7 +686,7 @@ describe('Transactions', () => {
null,
);
- let addButton = container.querySelector('[data-testid="add-button"]');
+ const addButton = container.querySelector('[data-testid="add-button"]');
expect(getTransactions().length).toBe(5);
await userEvent.click(addButton);
@@ -727,7 +727,7 @@ describe('Transactions', () => {
// The cancel button should also close the new transaction form
updateProps({ isAdding: true });
- let cancelButton = container.querySelectorAll(
+ const cancelButton = container.querySelectorAll(
'[data-testid="new-transaction"] [data-testid="cancel-button"]',
)[0];
await userEvent.click(cancelButton);
@@ -757,7 +757,7 @@ describe('Transactions', () => {
test('transaction can be split, updated, and deleted', async () => {
const { container, getTransactions, updateProps } = renderTransactions();
- let transactions = [...getTransactions()];
+ const transactions = [...getTransactions()];
// Change the id to simulate a new transaction being added, and
// work with that one. This makes sure that the transaction table
// properly references new data.
@@ -781,8 +781,8 @@ describe('Transactions', () => {
}
let input = await editField(container, 'category', 0);
- let tooltip = container.querySelector('[data-testid="autocomplete"]');
- let splitButton = tooltip.querySelector(
+ const tooltip = container.querySelector('[data-testid="autocomplete"]');
+ const splitButton = tooltip.querySelector(
'[data-testid="split-transaction-button"]',
);
@@ -800,12 +800,12 @@ describe('Transactions', () => {
expect(getTransactions()[1].amount).toBe(0);
expectErrorToExist(getTransactions().slice(0, 2));
- let toolbars = container.querySelectorAll(
+ const toolbars = container.querySelectorAll(
'[data-testid="transaction-error"]',
);
// Make sure the toolbar has appeared
expect(toolbars.length).toBe(1);
- let toolbar = toolbars[0];
+ const toolbar = toolbars[0];
// Enter an amount for the new split transaction and make sure the
// toolbar updates
@@ -897,8 +897,8 @@ describe('Transactions', () => {
const { container, getTransactions } = renderTransactions();
let input = await editField(container, 'category', 0);
- let tooltip = container.querySelector('[data-testid="autocomplete"]');
- let splitButton = tooltip.querySelector(
+ const tooltip = container.querySelector('[data-testid="autocomplete"]');
+ const splitButton = tooltip.querySelector(
'[data-testid="split-transaction-button"',
);
diff --git a/packages/desktop-client/src/components/util/AmountInput.tsx b/packages/desktop-client/src/components/util/AmountInput.tsx
index e4e57e0c7a3..632082cf9ea 100644
--- a/packages/desktop-client/src/components/util/AmountInput.tsx
+++ b/packages/desktop-client/src/components/util/AmountInput.tsx
@@ -35,16 +35,16 @@ export function AmountInput({
textStyle,
focused,
}: AmountInputProps) {
- let format = useFormat();
- let [negative, setNegative] = useState(
+ const format = useFormat();
+ const [negative, setNegative] = useState(
(initialValue === 0 && zeroSign === '-') || initialValue < 0,
);
- let initialValueAbsolute = format(Math.abs(initialValue), 'financial');
- let [value, setValue] = useState(initialValueAbsolute);
+ const initialValueAbsolute = format(Math.abs(initialValue), 'financial');
+ const [value, setValue] = useState(initialValueAbsolute);
useEffect(() => setValue(initialValueAbsolute), [initialValueAbsolute]);
- let buttonRef = useRef();
+ const buttonRef = useRef();
function onSwitch() {
setNegative(!negative);
@@ -52,10 +52,10 @@ export function AmountInput({
}
function fireChange(val, neg) {
- let valueOrInitial = Math.abs(
+ const valueOrInitial = Math.abs(
amountToInteger(evalArithmetic(val, initialValueAbsolute)),
);
- let amount = neg ? valueOrInitial * -1 : valueOrInitial;
+ const amount = neg ? valueOrInitial * -1 : valueOrInitial;
onChange?.(amount);
}
@@ -64,8 +64,8 @@ export function AmountInput({
setValue(value ? value : '');
}
- let ref = useRef();
- let mergedRef = useMergedRefs(inputRef, ref);
+ const ref = useRef();
+ const mergedRef = useMergedRefs(inputRef, ref);
useEffect(() => {
if (focused) {
@@ -118,8 +118,8 @@ export function AmountInput({
}
export function BetweenAmountInput({ defaultValue, onChange }) {
- let [num1, setNum1] = useState(defaultValue.num1);
- let [num2, setNum2] = useState(defaultValue.num2);
+ const [num1, setNum1] = useState(defaultValue.num1);
+ const [num2, setNum2] = useState(defaultValue.num2);
return (
diff --git a/packages/desktop-client/src/components/util/DisplayId.tsx b/packages/desktop-client/src/components/util/DisplayId.tsx
index 0a66bf34f2f..ecc14437543 100644
--- a/packages/desktop-client/src/components/util/DisplayId.tsx
+++ b/packages/desktop-client/src/components/util/DisplayId.tsx
@@ -33,7 +33,7 @@ export default function DisplayId({
return (
{data => {
- let item = data[id];
+ const item = data[id];
return (
state.queries.saved);
- let dateFormat = useSelector(
+ const { grouped: categoryGroups } = useCategories();
+ const saved = useSelector(state => state.queries.saved);
+ const dateFormat = useSelector(
state => state.prefs.local.dateFormat || 'MM/dd/yyyy',
);
@@ -38,7 +38,7 @@ export default function GenericInput({
return null;
}
- let showPlaceholder = multi ? value.length === 0 : true;
+ const showPlaceholder = multi ? value.length === 0 : true;
let content;
switch (type) {
diff --git a/packages/desktop-client/src/components/util/LoadComponent.tsx b/packages/desktop-client/src/components/util/LoadComponent.tsx
index 08be27854aa..74a97f62d4c 100644
--- a/packages/desktop-client/src/components/util/LoadComponent.tsx
+++ b/packages/desktop-client/src/components/util/LoadComponent.tsx
@@ -22,7 +22,7 @@ function LoadComponentInner({
message,
importer,
}: LoadComponentProps) {
- let [Component, setComponent] = useState(null);
+ const [Component, setComponent] = useState(null);
useEffect(() => {
importer().then(module => setComponent(() => module[name]));
}, [name, importer]);
diff --git a/packages/desktop-client/src/hooks/useSelected.tsx b/packages/desktop-client/src/hooks/useSelected.tsx
index 21455ab4ecd..934318e3661 100644
--- a/packages/desktop-client/src/hooks/useSelected.tsx
+++ b/packages/desktop-client/src/hooks/useSelected.tsx
@@ -340,10 +340,8 @@ export function SelectedProviderWithItems({
}, [registerDispatch]);
return (
-
- instance={selected}
- fetchAllIds={fetchAllIds}
- children={children}
- />
+ instance={selected} fetchAllIds={fetchAllIds}>
+ {children}
+
);
}
diff --git a/packages/loot-core/src/client/data-hooks/accounts.tsx b/packages/loot-core/src/client/data-hooks/accounts.tsx
index 084060f3b87..7bcde4b7bfc 100644
--- a/packages/loot-core/src/client/data-hooks/accounts.tsx
+++ b/packages/loot-core/src/client/data-hooks/accounts.tsx
@@ -13,7 +13,9 @@ const AccountsContext = createContext(null);
export function AccountsProvider({ children }) {
const data = useAccounts();
- return ;
+ return (
+ {children}
+ );
}
export function CachedAccounts({ children, idKey }) {
diff --git a/packages/loot-core/src/client/data-hooks/payees.tsx b/packages/loot-core/src/client/data-hooks/payees.tsx
index f5b1956aca4..8197d50e7af 100644
--- a/packages/loot-core/src/client/data-hooks/payees.tsx
+++ b/packages/loot-core/src/client/data-hooks/payees.tsx
@@ -13,7 +13,9 @@ const PayeesContext = createContext(null);
export function PayeesProvider({ children }) {
const data = usePayees();
- return ;
+ return (
+ {children}
+ );
}
export function CachedPayees({ children, idKey }) {
diff --git a/packages/loot-core/src/client/data-hooks/schedules.tsx b/packages/loot-core/src/client/data-hooks/schedules.tsx
index a139658c9b2..0a46c38e96f 100644
--- a/packages/loot-core/src/client/data-hooks/schedules.tsx
+++ b/packages/loot-core/src/client/data-hooks/schedules.tsx
@@ -69,7 +69,11 @@ const SchedulesContext = createContext(null);
export function SchedulesProvider({ transform, children }) {
const data = useSchedules({ transform });
- return ;
+ return (
+
+ {children}
+
+ );
}
export function useCachedSchedules() {
diff --git a/packages/loot-core/src/client/query-hooks.tsx b/packages/loot-core/src/client/query-hooks.tsx
index 329f466b736..52314faa376 100644
--- a/packages/loot-core/src/client/query-hooks.tsx
+++ b/packages/loot-core/src/client/query-hooks.tsx
@@ -46,7 +46,7 @@ function makeContext(queryState, opts, QueryClass) {
};
}, []);
- return ;
+ return {children};
}
function useQuery() {
diff --git a/packages/loot-core/src/server/db/index.test.ts b/packages/loot-core/src/server/db/index.test.ts
index 60834456263..007269d56ff 100644
--- a/packages/loot-core/src/server/db/index.test.ts
+++ b/packages/loot-core/src/server/db/index.test.ts
@@ -38,6 +38,21 @@ describe('Database', () => {
expect((await db.getCategories()).length).toBe(1);
});
+ test('using a deleted category name works', async () => {
+ await db.insertCategoryGroup({ id: 'group1', name: 'group1' });
+ const id = await db.insertCategory({
+ name: 'foo',
+ cat_group: 'group1',
+ });
+ await db.deleteCategory({ id });
+ expect((await db.getCategories()).length).toBe(0);
+ await db.insertCategory({
+ name: 'foo',
+ cat_group: 'group1',
+ });
+ expect((await db.getCategories()).length).toBe(1);
+ });
+
test('transactions are sorted by date', async () => {
await insertTransactions([
{ date: '2018-01-05', account: 'foo', amount: -23 },
diff --git a/packages/loot-core/src/server/db/index.ts b/packages/loot-core/src/server/db/index.ts
index 9b152daf858..8ed8f811761 100644
--- a/packages/loot-core/src/server/db/index.ts
+++ b/packages/loot-core/src/server/db/index.ts
@@ -348,7 +348,7 @@ export async function insertCategory(
await batchMessages(async () => {
// Dont allow duplicated names in groups
const existingCatInGroup = await first(
- `SELECT id FROM categories WHERE cat_group = ? and UPPER(name) = ? LIMIT 1`,
+ `SELECT id FROM categories WHERE cat_group = ? and UPPER(name) = ? and tombstone = 0 LIMIT 1`,
[category.cat_group, category.name.toUpperCase()],
);
if (existingCatInGroup) {
diff --git a/upcoming-release-notes/1993.md b/upcoming-release-notes/1993.md
new file mode 100644
index 00000000000..ea16e7de6e4
--- /dev/null
+++ b/upcoming-release-notes/1993.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [joel-jeremy]
+---
+
+Use Page component for mobile pages
diff --git a/upcoming-release-notes/2002.md b/upcoming-release-notes/2002.md
new file mode 100644
index 00000000000..de2fc7cba3d
--- /dev/null
+++ b/upcoming-release-notes/2002.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [kymckay]
+---
+
+Prevent deleted categories blocking creation of new categories with the same name.
diff --git a/upcoming-release-notes/2008.md b/upcoming-release-notes/2008.md
new file mode 100644
index 00000000000..2d170fd6cc3
--- /dev/null
+++ b/upcoming-release-notes/2008.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [vishnukaushik]
+---
+
+Fix filter Amount formatting issue
\ No newline at end of file
diff --git a/upcoming-release-notes/2029.md b/upcoming-release-notes/2029.md
new file mode 100644
index 00000000000..68c09ee2a46
--- /dev/null
+++ b/upcoming-release-notes/2029.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [MatissJanis]
+---
+
+Enable `react/no-children-prop` rule and fix the issues
diff --git a/upcoming-release-notes/2031.md b/upcoming-release-notes/2031.md
new file mode 100644
index 00000000000..cd7fa53c60a
--- /dev/null
+++ b/upcoming-release-notes/2031.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [joel-jeremy]
+---
+
+Fix bulk edit field modal in desktop
diff --git a/upcoming-release-notes/2033.md b/upcoming-release-notes/2033.md
new file mode 100644
index 00000000000..afd0770965a
--- /dev/null
+++ b/upcoming-release-notes/2033.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [joel-jeremy]
+---
+
+Apply ESLint prefer-const on components folder part 1
diff --git a/upcoming-release-notes/2034.md b/upcoming-release-notes/2034.md
new file mode 100644
index 00000000000..82aadd8c442
--- /dev/null
+++ b/upcoming-release-notes/2034.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [joel-jeremy]
+---
+
+Apply ESLint prefer-const on components folder part 2
diff --git a/upcoming-release-notes/2036.md b/upcoming-release-notes/2036.md
new file mode 100644
index 00000000000..913201b7303
--- /dev/null
+++ b/upcoming-release-notes/2036.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [twk3]
+---
+
+Add api tests for categories and category groups