Skip to content

A local-first personal finance app

feat(mobile): ability to delete rules (#5556)

Matiss Janis Aboltins1ce53b2762ca
diff --git a/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-clicking-on-a-rule-opens-edit-form-1-chromium-linux.png b/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-clicking-on-a-rule-opens-edit-form-1-chromium-linux.png
index 753c00aec2..58de25df80 100644
Binary files a/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-clicking-on-a-rule-opens-edit-form-1-chromium-linux.png and b/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-clicking-on-a-rule-opens-edit-form-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-clicking-on-a-rule-opens-edit-form-2-chromium-linux.png b/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-clicking-on-a-rule-opens-edit-form-2-chromium-linux.png
index 469c970717..f93bc302bc 100644
Binary files a/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-clicking-on-a-rule-opens-edit-form-2-chromium-linux.png and b/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-clicking-on-a-rule-opens-edit-form-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-clicking-on-a-rule-opens-edit-form-3-chromium-linux.png b/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-clicking-on-a-rule-opens-edit-form-3-chromium-linux.png
index edde75b8fd..302bfc1b76 100644
Binary files a/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-clicking-on-a-rule-opens-edit-form-3-chromium-linux.png and b/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-clicking-on-a-rule-opens-edit-form-3-chromium-linux.png differ
diff --git a/packages/desktop-client/src/components/Modals.tsx b/packages/desktop-client/src/components/Modals.tsx
index d3315fc67c..e5e995e706 100644
--- a/packages/desktop-client/src/components/Modals.tsx
+++ b/packages/desktop-client/src/components/Modals.tsx
@@ -16,7 +16,7 @@ import { CategoryGroupMenuModal } from './modals/CategoryGroupMenuModal';
import { CategoryMenuModal } from './modals/CategoryMenuModal';
import { CloseAccountModal } from './modals/CloseAccountModal';
import { ConfirmCategoryDeleteModal } from './modals/ConfirmCategoryDeleteModal';
-import { ConfirmTransactionDeleteModal } from './modals/ConfirmTransactionDeleteModal';
+import { ConfirmDeleteModal } from './modals/ConfirmDeleteModal';
import { ConfirmTransactionEditModal } from './modals/ConfirmTransactionEditModal';
import { ConfirmUnlinkAccountModal } from './modals/ConfirmUnlinkAccountModal';
import { CoverModal } from './modals/CoverModal';
@@ -132,8 +132,8 @@ export function Modals() {
case 'confirm-transaction-edit':
return <ConfirmTransactionEditModal key={key} {...modal.options} />;
- case 'confirm-transaction-delete':
- return <ConfirmTransactionDeleteModal key={key} {...modal.options} />;
+ case 'confirm-delete':
+ return <ConfirmDeleteModal key={key} {...modal.options} />;
case 'load-backup':
return (
diff --git a/packages/desktop-client/src/components/mobile/rules/MobileRuleEditPage.tsx b/packages/desktop-client/src/components/mobile/rules/MobileRuleEditPage.tsx
index f7d48919cd..b8721f9165 100644
--- a/packages/desktop-client/src/components/mobile/rules/MobileRuleEditPage.tsx
+++ b/packages/desktop-client/src/components/mobile/rules/MobileRuleEditPage.tsx
@@ -13,11 +13,15 @@ import { MobileBackButton } from '@desktop-client/components/mobile/MobileBackBu
import { MobilePageHeader, Page } from '@desktop-client/components/Page';
import { RuleEditor } from '@desktop-client/components/rules/RuleEditor';
import { useNavigate } from '@desktop-client/hooks/useNavigate';
+import { pushModal } from '@desktop-client/modals/modalsSlice';
+import { addNotification } from '@desktop-client/notifications/notificationsSlice';
+import { useDispatch } from '@desktop-client/redux';
export function MobileRuleEditPage() {
const { t } = useTranslation();
const navigate = useNavigate();
const { id } = useParams<{ id?: string }>();
+ const dispatch = useDispatch();
const [rule, setRule] = useState<RuleEntity | null>(null);
const [isLoading, setIsLoading] = useState(false);
@@ -77,6 +81,48 @@ export function MobileRuleEditPage() {
navigate('/rules');
};
+ const handleDelete = () => {
+ // Runtime guard to ensure id exists
+ if (!id || id === 'new') {
+ throw new Error('Cannot delete rule: invalid id');
+ }
+
+ dispatch(
+ pushModal({
+ modal: {
+ name: 'confirm-delete',
+ options: {
+ message: t('Are you sure you want to delete this rule?'),
+ onConfirm: async () => {
+ try {
+ await send('rule-delete', id);
+ dispatch(
+ addNotification({
+ notification: {
+ type: 'message',
+ message: t('Rule deleted successfully'),
+ },
+ }),
+ );
+ navigate('/rules');
+ } catch (error) {
+ console.error('Failed to delete rule:', error);
+ dispatch(
+ addNotification({
+ notification: {
+ type: 'error',
+ message: t('Failed to delete rule. Please try again.'),
+ },
+ }),
+ );
+ }
+ },
+ },
+ },
+ }),
+ );
+ };
+
const isEditing = Boolean(id && id !== 'new' && rule);
const pageTitle = isEditing ? t('Edit Rule') : t('Create Rule');
@@ -122,6 +168,7 @@ export function MobileRuleEditPage() {
rule={defaultRule}
onSave={handleSave}
onCancel={handleCancel}
+ onDelete={isEditing ? handleDelete : undefined}
style={{
paddingTop: 10,
flex: 1,
diff --git a/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.jsx b/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.jsx
index 97c53068a8..0a08ec5ef1 100644
--- a/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.jsx
+++ b/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.jsx
@@ -743,8 +743,9 @@ const TransactionEditInner = memo(function TransactionEditInner({
dispatch(
pushModal({
modal: {
- name: 'confirm-transaction-delete',
+ name: 'confirm-delete',
options: {
+ message: t('Are you sure you want to delete the transaction?'),
onConfirm: () => {
onDelete(id);
@@ -778,7 +779,14 @@ const TransactionEditInner = memo(function TransactionEditInner({
onConfirmDelete();
}
},
- [dispatch, navigate, onClearActiveEdit, onDelete, unserializedTransactions],
+ [
+ dispatch,
+ navigate,
+ onClearActiveEdit,
+ onDelete,
+ unserializedTransactions,
+ t,
+ ],
);
const scrollChildTransactionIntoView = useCallback(id => {
diff --git a/packages/desktop-client/src/components/modals/ConfirmTransactionDeleteModal.tsx b/packages/desktop-client/src/components/modals/ConfirmDeleteModal.tsx
similarity index 87%
rename from packages/desktop-client/src/components/modals/ConfirmTransactionDeleteModal.tsx
rename to packages/desktop-client/src/components/modals/ConfirmDeleteModal.tsx
index 15b55e2ebe..4a8f1064a8 100644
--- a/packages/desktop-client/src/components/modals/ConfirmTransactionDeleteModal.tsx
+++ b/packages/desktop-client/src/components/modals/ConfirmDeleteModal.tsx
@@ -15,15 +15,15 @@ import {
} from '@desktop-client/components/common/Modal';
import { type Modal as ModalType } from '@desktop-client/modals/modalsSlice';
-type ConfirmTransactionDeleteModalProps = Extract<
+type ConfirmDeleteModalProps = Extract<
ModalType,
- { name: 'confirm-transaction-delete' }
+ { name: 'confirm-delete' }
>['options'];
-export function ConfirmTransactionDeleteModal({
- message = 'Are you sure you want to delete the transaction?',
+export function ConfirmDeleteModal({
+ message,
onConfirm,
-}: ConfirmTransactionDeleteModalProps) {
+}: ConfirmDeleteModalProps) {
const { t } = useTranslation();
const { isNarrowWidth } = useResponsive();
const narrowButtonStyle = isNarrowWidth
@@ -33,7 +33,7 @@ export function ConfirmTransactionDeleteModal({
: {};
return (
- <Modal name="confirm-transaction-delete">
+ <Modal name="confirm-delete">
{({ state: { close } }) => (
<>
<ModalHeader
diff --git a/packages/desktop-client/src/components/rules/RuleEditor.tsx b/packages/desktop-client/src/components/rules/RuleEditor.tsx
index 3e869e2b03..5a2bea1be3 100644
--- a/packages/desktop-client/src/components/rules/RuleEditor.tsx
+++ b/packages/desktop-client/src/components/rules/RuleEditor.tsx
@@ -900,12 +900,14 @@ type RuleEditorProps = {
rule: RuleEntity | NewRuleEntity;
onSave?: (rule: RuleEntity) => void;
onCancel?: () => void;
+ onDelete?: () => void;
style?: CSSProperties;
};
export function RuleEditor({
rule: defaultRule,
onSave: originalOnSave = undefined,
+ onDelete,
onCancel,
style,
}: RuleEditorProps) {
@@ -1385,14 +1387,27 @@ export function RuleEditor({
}}
/>
- <Stack direction="row" justify="flex-end" style={{ marginTop: 20 }}>
- <Button onClick={onCancel}>
- <Trans>Cancel</Trans>
- </Button>
- <Button variant="primary" onPress={() => onSave(onCancel)}>
- <Trans>Save</Trans>
- </Button>
- </Stack>
+ <SpaceBetween
+ style={{
+ marginTop: 20,
+ justifyContent: onDelete ? 'space-between' : 'flex-end',
+ }}
+ >
+ {onDelete && (
+ <Button onPress={onDelete}>
+ <Trans>Delete</Trans>
+ </Button>
+ )}
+
+ <SpaceBetween>
+ <Button onPress={onCancel}>
+ <Trans>Cancel</Trans>
+ </Button>
+ <Button variant="primary" onPress={() => onSave(onCancel)}>
+ <Trans>Save</Trans>
+ </Button>
+ </SpaceBetween>
+ </SpaceBetween>
</View>
</SelectedProvider>
</View>
diff --git a/packages/desktop-client/src/hooks/useTransactionBatchActions.ts b/packages/desktop-client/src/hooks/useTransactionBatchActions.ts
index dedeb016c6..15dd422968 100644
--- a/packages/desktop-client/src/hooks/useTransactionBatchActions.ts
+++ b/packages/desktop-client/src/hooks/useTransactionBatchActions.ts
@@ -1,3 +1,5 @@
+import { useTranslation } from 'react-i18next';
+
import { send } from 'loot-core/platform/client/fetch';
import * as monthUtils from 'loot-core/shared/months';
import { q } from 'loot-core/shared/query';
@@ -58,6 +60,7 @@ type BatchUnlinkScheduleProps = {
export function useTransactionBatchActions() {
const dispatch = useDispatch();
+ const { t } = useTranslation();
const onBatchEdit = async ({ name, ids, onSuccess }: BatchEditProps) => {
const { data } = await aqlQuery(
@@ -309,12 +312,15 @@ export function useTransactionBatchActions() {
dispatch(
pushModal({
modal: {
- name: 'confirm-transaction-delete',
+ name: 'confirm-delete',
options: {
message:
ids.length > 1
- ? `Are you sure you want to delete these ${ids.length} transaction${ids.length > 1 ? 's' : ''}?`
- : undefined,
+ ? t(
+ 'Are you sure you want to delete these {{count}} transactions?',
+ { count: ids.length },
+ )
+ : t('Are you sure you want to delete the transaction?'),
onConfirm: async () => {
const { data } = await aqlQuery(
q('transactions')
diff --git a/packages/desktop-client/src/modals/modalsSlice.ts b/packages/desktop-client/src/modals/modalsSlice.ts
index 296da13eac..bc7f584bb2 100644
--- a/packages/desktop-client/src/modals/modalsSlice.ts
+++ b/packages/desktop-client/src/modals/modalsSlice.ts
@@ -482,9 +482,9 @@ export type Modal =
};
}
| {
- name: 'confirm-transaction-delete';
+ name: 'confirm-delete';
options: {
- message?: string | undefined;
+ message: string;
onConfirm: () => void;
};
}
diff --git a/upcoming-release-notes/5556.md b/upcoming-release-notes/5556.md
new file mode 100644
index 0000000000..e4447e1cc1
--- /dev/null
+++ b/upcoming-release-notes/5556.md
@@ -0,0 +1,7 @@
+---
+category: Features
+authors: [MatissJanis]
+---
+
+Add ability to delete rules with a new confirmation modal in mobile rule editing.
+