Skip to content

A local-first personal finance app

Fix error on budget file selection page when using server (#4670)

Joel Jeremy Marquezaf09e5b1d5be
diff --git a/packages/desktop-client/src/components/Modals.tsx b/packages/desktop-client/src/components/Modals.tsx
index 87ace6ec99..f561ba3e16 100644
--- a/packages/desktop-client/src/components/Modals.tsx
+++ b/packages/desktop-client/src/components/Modals.tsx
@@ -13,7 +13,7 @@ import { useDispatch } from '../redux';
import { EditSyncAccount } from './banksync/EditSyncAccount';
import { AccountAutocompleteModal } from './modals/AccountAutocompleteModal';
import { AccountMenuModal } from './modals/AccountMenuModal';
-import { BudgetFileSelectionModal } from './modals/BudgetListModal';
+import { BudgetFileSelectionModal } from './modals/BudgetFileSelectionModal';
import { BudgetPageMenuModal } from './modals/BudgetPageMenuModal';
import { CategoryAutocompleteModal } from './modals/CategoryAutocompleteModal';
import { CategoryGroupMenuModal } from './modals/CategoryGroupMenuModal';
@@ -335,7 +335,7 @@ export function Modals() {
</NamespaceContext.Provider>
);
- case 'budget-list':
+ case 'budget-file-selection':
return <BudgetFileSelectionModal key={name} />;
case 'delete-budget':
return <DeleteFileModal key={name} {...modal.options} />;
diff --git a/packages/desktop-client/src/components/manager/BudgetFileSelection.tsx b/packages/desktop-client/src/components/manager/BudgetFileSelection.tsx
index 7f0af2d1a9..c93efbf86f 100644
--- a/packages/desktop-client/src/components/manager/BudgetFileSelection.tsx
+++ b/packages/desktop-client/src/components/manager/BudgetFileSelection.tsx
@@ -419,17 +419,21 @@ function BudgetFileList({
</Text>
)}
>
- {file => (
- <BudgetFileListItem
- key={isLocalFile(file) ? file.id : file.cloudFileId}
- value={file}
- currentUserId={currentUserId}
- quickSwitchMode={quickSwitchMode}
- onSelect={onSelect}
- onDelete={onDelete}
- onDuplicate={onDuplicate}
- />
- )}
+ {file => {
+ const id = isLocalFile(file) ? file.id : file.cloudFileId;
+ return (
+ <BudgetFileListItem
+ key={id}
+ id={id}
+ value={file}
+ currentUserId={currentUserId}
+ quickSwitchMode={quickSwitchMode}
+ onSelect={onSelect}
+ onDelete={onDelete}
+ onDuplicate={onDuplicate}
+ />
+ );
+ }}
</GridList>
);
}
diff --git a/packages/desktop-client/src/components/mobile/budget/index.tsx b/packages/desktop-client/src/components/mobile/budget/index.tsx
index 60596449e5..9b08012080 100644
--- a/packages/desktop-client/src/components/mobile/budget/index.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/index.tsx
@@ -498,7 +498,7 @@ export function Budget() {
);
const onSwitchBudgetFile = useCallback(() => {
- dispatch(pushModal({ modal: { name: 'budget-list' } }));
+ dispatch(pushModal({ modal: { name: 'budget-file-selection' } }));
}, [dispatch]);
const onOpenBudgetMonthMenu = useCallback(
diff --git a/packages/desktop-client/src/components/modals/BudgetListModal.tsx b/packages/desktop-client/src/components/modals/BudgetFileSelectionModal.tsx
similarity index 97%
rename from packages/desktop-client/src/components/modals/BudgetListModal.tsx
rename to packages/desktop-client/src/components/modals/BudgetFileSelectionModal.tsx
index 344327d972..de57c2d224 100644
--- a/packages/desktop-client/src/components/modals/BudgetListModal.tsx
+++ b/packages/desktop-client/src/components/modals/BudgetFileSelectionModal.tsx
@@ -17,7 +17,7 @@ export function BudgetFileSelectionModal() {
);
return (
- <Modal name="budget-list">
+ <Modal name="budget-file-selection">
{({ state: { close } }) => (
<>
<ModalHeader
diff --git a/packages/loot-core/src/client/modals/modalsSlice.ts b/packages/loot-core/src/client/modals/modalsSlice.ts
index 9222879ada..4119888e72 100644
--- a/packages/loot-core/src/client/modals/modalsSlice.ts
+++ b/packages/loot-core/src/client/modals/modalsSlice.ts
@@ -453,7 +453,7 @@ export type Modal =
};
}
| {
- name: 'budget-list';
+ name: 'budget-file-selection';
}
| {
name: 'confirm-transaction-edit';
diff --git a/upcoming-release-notes/4670.md b/upcoming-release-notes/4670.md
new file mode 100644
index 0000000000..04ac93d480
--- /dev/null
+++ b/upcoming-release-notes/4670.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [joel-jeremy]
+---
+
+Fix error on budget file selection page when using server