A local-first personal finance app
[Mobile] Fix account notes not retrieving correctly in mobile (#2599)
Joel Jeremy Marquez672dd5ea4bdd
diff --git a/packages/desktop-client/src/components/NotesButton.tsx b/packages/desktop-client/src/components/NotesButton.tsxindex f39af29506..bbd42b33cb 100644--- a/packages/desktop-client/src/components/NotesButton.tsx+++ b/packages/desktop-client/src/components/NotesButton.tsx@@ -1,10 +1,8 @@import React, { useEffect, useRef, useState, type ComponentProps } from 'react';-import { useLiveQuery } from 'loot-core/src/client/query-hooks';import { send } from 'loot-core/src/platform/client/fetch';-import { q } from 'loot-core/src/shared/query';-import { type NoteEntity } from 'loot-core/types/models';+import { useNotes } from '../hooks/useNotes';import { SvgCustomNotesPaper } from '../icons/v2';import { type CSSProperties, theme } from '../style';@@ -32,11 +30,7 @@ export function NotesButton({}: NotesButtonProps) {const triggerRef = useRef(null);const [isOpen, setIsOpen] = useState<boolean>(false);- const data = useLiveQuery<NoteEntity[]>(- () => q('notes').filter({ id }).select('*'),- [id],- );- const note = data && data.length > 0 ? data[0].note : '';+ const note = useNotes(id) || '';const hasNotes = note && note !== '';const [tempNotes, setTempNotes] = useState<string>(note);diff --git a/packages/desktop-client/src/components/modals/AccountMenuModal.tsx b/packages/desktop-client/src/components/modals/AccountMenuModal.tsxindex f798c50327..5e18914e47 100644--- a/packages/desktop-client/src/components/modals/AccountMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/AccountMenuModal.tsx@@ -1,10 +1,9 @@import React, { type ComponentProps, useState } from 'react';-import { useLiveQuery } from 'loot-core/src/client/query-hooks';-import { q } from 'loot-core/src/shared/query';import { type AccountEntity } from 'loot-core/types/models';import { useAccounts } from '../../hooks/useAccounts';+import { useNotes } from '../../hooks/useNotes';import { SvgClose, SvgDotsHorizontalTriple, SvgLockOpen } from '../../icons/v1';import { SvgNotesPaper } from '../../icons/v2';import { type CSSProperties, styles, theme } from '../../style';@@ -16,11 +15,6 @@ import { type CommonModalProps } from '../Modals';import { Notes } from '../Notes';import { Tooltip } from '../tooltips';-type NoteEntity = {- id: string;- note: string;-};-type AccountMenuModalProps = {modalProps: CommonModalProps;accountId: string;@@ -42,11 +36,7 @@ export function AccountMenuModal({}: AccountMenuModalProps) {const accounts = useAccounts();const account = accounts.find(c => c.id === accountId);- const data = useLiveQuery(- () => q('notes').filter({ id: account?.id }).select('*'),- [account?.id],- ) as NoteEntity[] | null;- const originalNotes = data && data.length > 0 ? data[0].note : null;+ const originalNotes = useNotes(`account-${accountId}`);const _onClose = () => {modalProps?.onClose();diff --git a/packages/desktop-client/src/components/modals/CategoryGroupMenuModal.tsx b/packages/desktop-client/src/components/modals/CategoryGroupMenuModal.tsxindex e9a2c1ffd1..e9d9a77682 100644--- a/packages/desktop-client/src/components/modals/CategoryGroupMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/CategoryGroupMenuModal.tsx@@ -1,14 +1,10 @@// @ts-strict-ignoreimport React, { type ComponentProps, useState } from 'react';-import { useLiveQuery } from 'loot-core/src/client/query-hooks';-import { q } from 'loot-core/src/shared/query';-import {- type CategoryGroupEntity,- type NoteEntity,-} from 'loot-core/src/types/models';+import { type CategoryGroupEntity } from 'loot-core/src/types/models';import { useCategories } from '../../hooks/useCategories';+import { useNotes } from '../../hooks/useNotes';import { SvgDotsHorizontalTriple, SvgAdd, SvgTrash } from '../../icons/v1';import { SvgNotesPaper, SvgViewHide, SvgViewShow } from '../../icons/v2';import { type CSSProperties, styles, theme } from '../../style';@@ -42,11 +38,7 @@ export function CategoryGroupMenuModal({}: CategoryGroupMenuModalProps) {const { grouped: categoryGroups } = useCategories();const group = categoryGroups.find(g => g.id === groupId);- const data = useLiveQuery<NoteEntity[]>(- () => q('notes').filter({ id: group.id }).select('*'),- [group.id],- );- const notes = data && data.length > 0 ? data[0].note : null;+ const notes = useNotes(group.id);const _onClose = () => {modalProps?.onClose();diff --git a/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx b/packages/desktop-client/src/components/modals/CategoryMenuModal.tsxindex 686e99dd40..82c8bff783 100644--- a/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx@@ -1,15 +1,11 @@// @ts-strict-ignoreimport React, { useState } from 'react';-import { useLiveQuery } from 'loot-core/src/client/query-hooks';-import { q } from 'loot-core/src/shared/query';-import {- type CategoryEntity,- type NoteEntity,-} from 'loot-core/src/types/models';+import { type CategoryEntity } from 'loot-core/src/types/models';import { useCategory } from '../../hooks/useCategory';import { useCategoryGroup } from '../../hooks/useCategoryGroup';+import { useNotes } from '../../hooks/useNotes';import { SvgDotsHorizontalTriple, SvgTrash } from '../../icons/v1';import { SvgNotesPaper, SvgViewHide, SvgViewShow } from '../../icons/v2';import { type CSSProperties, styles, theme } from '../../style';@@ -40,12 +36,7 @@ export function CategoryMenuModal({}: CategoryMenuModalProps) {const category = useCategory(categoryId);const categoryGroup = useCategoryGroup(category?.cat_group);- const data = useLiveQuery<NoteEntity[]>(- () => q('notes').filter({ id: category.id }).select('*'),- [category.id],- );- const originalNotes = data && data.length > 0 ? data[0].note : null;-+ const originalNotes = useNotes(category.id);const _onClose = () => {modalProps?.onClose();onClose?.();diff --git a/packages/desktop-client/src/components/modals/Notes.tsx b/packages/desktop-client/src/components/modals/Notes.tsxindex 47815e4d08..2391027219 100644--- a/packages/desktop-client/src/components/modals/Notes.tsx+++ b/packages/desktop-client/src/components/modals/Notes.tsx@@ -1,10 +1,7 @@// @ts-strict-ignoreimport React, { useEffect, useState } from 'react';-import { useLiveQuery } from 'loot-core/src/client/query-hooks';-import { q } from 'loot-core/src/shared/query';-import { type NoteEntity } from 'loot-core/types/models';-+import { useNotes } from '../../hooks/useNotes';import { SvgCheck } from '../../icons/v2';import { Button } from '../common/Button';import { Modal } from '../common/Modal';@@ -20,11 +17,7 @@ type NotesProps = {};export function Notes({ modalProps, id, name, onSave }: NotesProps) {- const data = useLiveQuery<NoteEntity[]>(- () => q('notes').filter({ id }).select('*'),- [id],- );- const originalNotes = data && data.length > 0 ? data[0].note : null;+ const originalNotes = useNotes(id);const [notes, setNotes] = useState(originalNotes);useEffect(() => setNotes(originalNotes), [originalNotes]);diff --git a/packages/desktop-client/src/hooks/useNotes.ts b/packages/desktop-client/src/hooks/useNotes.tsnew file mode 100644index 0000000000..9819b1f65c--- /dev/null+++ b/packages/desktop-client/src/hooks/useNotes.ts@@ -0,0 +1,13 @@+import { useMemo } from 'react';++import { useLiveQuery } from 'loot-core/client/query-hooks';+import { q } from 'loot-core/shared/query';+import { type NoteEntity } from 'loot-core/types/models';++export function useNotes(id: string) {+ const data = useLiveQuery<NoteEntity[]>(+ () => q('notes').filter({ id }).select('*'),+ [id],+ );+ return useMemo(() => (data && data.length > 0 ? data[0].note : null), [data]);+}diff --git a/upcoming-release-notes/2599.md b/upcoming-release-notes/2599.mdnew file mode 100644index 0000000000..3e0e85dcfa--- /dev/null+++ b/upcoming-release-notes/2599.md@@ -0,0 +1,6 @@+---+category: Bugfix+authors: [joel-jeremy]+---++Fix account notes not retrieving correctly in mobile.