Updated based on review

actualbudget · Apr 4, 2024 · 2ae6d8c · 2ae6d8c
1 parent dfb61b0
commit 2ae6d8c
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 17 deletions.
diff --git a/packages/desktop-client/src/components/autocomplete/AccountAutocomplete.tsx b/packages/desktop-client/src/components/autocomplete/AccountAutocomplete.tsx
@@ -166,8 +166,7 @@ type AccountItemProps = {
   embedded?: boolean;
 };
 
-// eslint-disable-next-line import/no-unused-modules
-export function AccountItem({
+function AccountItem({
   item,
   className,
   highlighted,

diff --git a/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx b/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx
@@ -297,8 +297,7 @@ type CategoryItemProps = {
   embedded?: boolean;
 };
 
-// eslint-disable-next-line import/no-unused-modules
-export function CategoryItem({
+function CategoryItem({
   item,
   className,
   style,

diff --git a/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsx b/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsx
@@ -472,8 +472,7 @@ type PayeeItemProps = {
   embedded?: boolean;
 };
 
-// eslint-disable-next-line import/no-unused-modules
-export function PayeeItem({
+function PayeeItem({
   item,
   className,
   highlighted,

diff --git a/packages/desktop-client/src/components/modals/AccountMenuModal.tsx b/packages/desktop-client/src/components/modals/AccountMenuModal.tsx
@@ -1,4 +1,3 @@
-// @ts-strict-ignore
 import React, { useState } from 'react';
 
 import { useLiveQuery } from 'loot-core/src/client/query-hooks';
@@ -17,6 +16,11 @@ 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;
@@ -39,17 +43,21 @@ export function AccountMenuModal({
   const accounts = useAccounts();
   const account = accounts.find(c => c.id === accountId);
   const data = useLiveQuery(
-    () => q('notes').filter({ id: account.id }).select('*'),
-    [account.id],
-  );
+    () => q('notes').filter({ id: account?.id }).select('*'),
+    [account?.id],
+  ) as NoteEntity[] | null;
   const originalNotes = data && data.length > 0 ? data[0].note : null;
 
   const _onClose = () => {
     modalProps?.onClose();
     onClose?.();
   };
 
-  const onRename = newName => {
+  const onRename = (newName: string) => {
+    if (!account) {
+      return;
+    }
+
     if (newName !== account.name) {
       onSave?.({
         ...account,
@@ -59,6 +67,10 @@ export function AccountMenuModal({
   };
 
   const _onEditNotes = () => {
+    if (!account) {
+      return;
+    }
+
     onEditNotes?.(account.id);
   };
 
@@ -70,6 +82,10 @@ export function AccountMenuModal({
     flexBasis: '100%',
   };
 
+  if (!account) {
+    return null;
+  }
+
   return (
     <Modal
       title={account.name}
@@ -109,7 +125,11 @@ export function AccountMenuModal({
             }}
           >
             <Notes
-              notes={originalNotes?.length > 0 ? originalNotes : 'No notes'}
+              notes={
+                originalNotes && originalNotes.length > 0
+                  ? originalNotes
+                  : 'No notes'
+              }
               editable={false}
               focused={false}
               getStyle={() => ({
@@ -152,7 +172,17 @@ export function AccountMenuModal({
   );
 }
 
-function AdditionalAccountMenu({ account, onClose, onReopen }) {
+type AdditionalAccountMenuProps = {
+  account: AccountEntity;
+  onClose?: (accountId: string) => void;
+  onReopen?: (accountId: string) => void;
+};
+
+function AdditionalAccountMenu({
+  account,
+  onClose,
+  onReopen,
+}: AdditionalAccountMenuProps) {
   const [menuOpen, setMenuOpen] = useState(false);
   const itemStyle: CSSProperties = {
     ...styles.mediumText,

diff --git a/packages/desktop-client/src/components/modals/CoverModal.tsx b/packages/desktop-client/src/components/modals/CoverModal.tsx
@@ -61,7 +61,7 @@ export function CoverModal({
 
   const category = categories.find(c => c.id === categoryId);
 
-  if (category == null) {
+  if (!category) {
     return null;
   }
 

diff --git a/packages/loot-core/src/server/main.ts b/packages/loot-core/src/server/main.ts
@@ -441,8 +441,7 @@ handlers['must-category-transfer'] = async function ({ id }) {
 
 handlers['payee-create'] = mutator(async function ({ name }) {
   return withUndo(async () => {
-    const id = await db.insertPayee({ name });
-    return id;
+    return db.insertPayee({ name });
   });
 });
 

diff --git a/upcoming-release-notes/2472.md b/upcoming-release-notes/2472.md
@@ -3,4 +3,4 @@ category: Enhancements
 authors: [joel-jeremy]
 ---
 
-Mobile menu modals.
+Add more modals in mobile for account, scheduled transactions, budget summary, and balance actions.