Skip to content

A local-first personal finance app

[AI] Add tag button mobile (#8344)

Alec Bakholdin0b239e0a6d1c
diff --git a/packages/api/tsconfig.json b/packages/api/tsconfig.json
index 69fa7e8c64..a3b6d43dbd 100644
--- a/packages/api/tsconfig.json
+++ b/packages/api/tsconfig.json
@@ -37,6 +37,8 @@
"@types",
"e2e",
"*.config.ts",
- "*.config.mts"
+ "*.config.mts",
+ "app/bundle.*",
+ "app/stats.json"
]
}
diff --git a/packages/component-library/src/icons/v0/Hash.tsx b/packages/component-library/src/icons/v0/Hash.tsx
new file mode 100644
index 0000000000..52abdf26f4
--- /dev/null
+++ b/packages/component-library/src/icons/v0/Hash.tsx
@@ -0,0 +1,30 @@
+import * as React from 'react';
+import type { SVGProps } from 'react';
+export const SvgHash = (props: SVGProps<SVGSVGElement>) => (
+ <svg
+ {...props}
+ xmlns="http://www.w3.org/2000/svg"
+ viewBox="0 0 24 24"
+ style={{
+ color: 'inherit',
+ ...props.style,
+ }}
+ >
+ <path fill="none" d="M0 0h24v24H0z" />
+ <g
+ fill="none"
+ stroke="currentColor"
+ strokeDashoffset={0}
+ strokeLinecap="round"
+ strokeLinejoin="round"
+ strokeWidth={2}
+ >
+ <g strokeDasharray={20}>
+ <path d="M4 9h17M3 15h17" fill="currentColor" />
+ </g>
+ <g strokeDasharray={22}>
+ <path d="M10 3 8 21M16 3l-2 18" fill="currentColor" />
+ </g>
+ </g>
+ </svg>
+);
diff --git a/packages/component-library/src/icons/v0/hash.svg b/packages/component-library/src/icons/v0/hash.svg
new file mode 100644
index 0000000000..e781ce77b1
--- /dev/null
+++ b/packages/component-library/src/icons/v0/hash.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24">
+ <path d="M0 0h24v24H0z" fill="none" />
+ <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
+ <g stroke-dasharray="20">
+ <path d="M4 9h17" stroke-dashoffset="0" />
+ <path stroke-dashoffset="0" d="M3 15h17" />
+ </g>
+ <g stroke-dasharray="22" stroke-dashoffset="22">
+ <path d="M10 3l-2 18" stroke-dashoffset="0" />
+ <path d="M16 3l-2 18" stroke-dashoffset="0" />
+ </g>
+ </g>
+</svg>
+
diff --git a/packages/component-library/src/icons/v0/index.ts b/packages/component-library/src/icons/v0/index.ts
index 893da4c0eb..c5f97c583e 100644
--- a/packages/component-library/src/icons/v0/index.ts
+++ b/packages/component-library/src/icons/v0/index.ts
@@ -5,5 +5,6 @@ export { SvgLeftArrow2 } from './LeftArrow2';
export { SvgMath } from './Math';
export { SvgRightArrow2 } from './RightArrow2';
export { SvgSubtract } from './Subtract';
+export { SvgHash } from './Hash';
export { SvgMerge } from './Merge';
export { SvgSplit } from './Split';
diff --git a/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-individual-account-page-and-checks-that-filtering-is-working-1-chromium-linux.png b/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-individual-account-page-and-checks-that-filtering-is-working-1-chromium-linux.png
index 7cff9b3526..6d1e414763 100644
Binary files a/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-individual-account-page-and-checks-that-filtering-is-working-1-chromium-linux.png and b/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-individual-account-page-and-checks-that-filtering-is-working-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-individual-account-page-and-checks-that-filtering-is-working-2-chromium-linux.png b/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-individual-account-page-and-checks-that-filtering-is-working-2-chromium-linux.png
index 44a4aafdb2..3ce14e202e 100644
Binary files a/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-individual-account-page-and-checks-that-filtering-is-working-2-chromium-linux.png and b/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-individual-account-page-and-checks-that-filtering-is-working-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-individual-account-page-and-checks-that-filtering-is-working-3-chromium-linux.png b/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-individual-account-page-and-checks-that-filtering-is-working-3-chromium-linux.png
index 40a06fa56b..124da3c86b 100644
Binary files a/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-individual-account-page-and-checks-that-filtering-is-working-3-chromium-linux.png and b/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-individual-account-page-and-checks-that-filtering-is-working-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-individual-account-page-and-checks-that-filtering-is-working-7-chromium-linux.png b/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-individual-account-page-and-checks-that-filtering-is-working-7-chromium-linux.png
index 0c5b54923f..62edc43fe0 100644
Binary files a/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-individual-account-page-and-checks-that-filtering-is-working-7-chromium-linux.png and b/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-individual-account-page-and-checks-that-filtering-is-working-7-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-individual-account-page-and-checks-that-filtering-is-working-8-chromium-linux.png b/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-individual-account-page-and-checks-that-filtering-is-working-8-chromium-linux.png
index 69117e3256..381def43e7 100644
Binary files a/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-individual-account-page-and-checks-that-filtering-is-working-8-chromium-linux.png and b/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-individual-account-page-and-checks-that-filtering-is-working-8-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-individual-account-page-and-checks-that-filtering-is-working-9-chromium-linux.png b/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-individual-account-page-and-checks-that-filtering-is-working-9-chromium-linux.png
index a6e54dd119..ba1863d688 100644
Binary files a/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-individual-account-page-and-checks-that-filtering-is-working-9-chromium-linux.png and b/packages/desktop-client/e2e/accounts.mobile.test.ts-snapshots/Mobile-Accounts-opens-individual-account-page-and-checks-that-filtering-is-working-9-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-1-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-1-chromium-linux.png
index 27189ba086..ec869fca65 100644
Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-1-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-2-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-2-chromium-linux.png
index 30afc780b5..b169ce41a1 100644
Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-2-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-3-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-3-chromium-linux.png
index 6a9eb835ee..92228ce4ce 100644
Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-3-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-4-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-4-chromium-linux.png
index c6d5869f44..1a5ed1475a 100644
Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-4-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-4-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-5-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-5-chromium-linux.png
index bf03a90e92..0daa9393ea 100644
Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-5-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-5-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-6-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-6-chromium-linux.png
index 57bb5cff77..37d9634d19 100644
Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-6-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-6-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--c18ad-l-redirects-to-the-category-transactions-page-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--c18ad-l-redirects-to-the-category-transactions-page-1-chromium-linux.png
index 45b8da1ab7..e3a5c18908 100644
Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--c18ad-l-redirects-to-the-category-transactions-page-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--c18ad-l-redirects-to-the-category-transactions-page-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--e995e-l-redirects-to-the-category-transactions-page-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--e995e-l-redirects-to-the-category-transactions-page-3-chromium-linux.png
index 1f0e6082ac..416657802e 100644
Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--e995e-l-redirects-to-the-category-transactions-page-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--e995e-l-redirects-to-the-category-transactions-page-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--ff568-l-redirects-to-the-category-transactions-page-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--ff568-l-redirects-to-the-category-transactions-page-2-chromium-linux.png
index b6a9a9951e..07230be95b 100644
Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--ff568-l-redirects-to-the-category-transactions-page-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--ff568-l-redirects-to-the-category-transactions-page-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--11290-l-redirects-to-the-category-transactions-page-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--11290-l-redirects-to-the-category-transactions-page-3-chromium-linux.png
index 74531680ec..416657802e 100644
Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--11290-l-redirects-to-the-category-transactions-page-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--11290-l-redirects-to-the-category-transactions-page-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--57d88-l-redirects-to-the-category-transactions-page-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--57d88-l-redirects-to-the-category-transactions-page-2-chromium-linux.png
index b6a9a9951e..07230be95b 100644
Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--57d88-l-redirects-to-the-category-transactions-page-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--57d88-l-redirects-to-the-category-transactions-page-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--5d90c-l-redirects-to-the-category-transactions-page-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--5d90c-l-redirects-to-the-category-transactions-page-1-chromium-linux.png
index 45b8da1ab7..e3a5c18908 100644
Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--5d90c-l-redirects-to-the-category-transactions-page-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--5d90c-l-redirects-to-the-category-transactions-page-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-4-chromium-linux.png b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-4-chromium-linux.png
index ea6ab6a317..6d023c4a0b 100644
Binary files a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-4-chromium-linux.png and b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-4-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-5-chromium-linux.png b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-5-chromium-linux.png
index ead8cfa4db..94f1415f81 100644
Binary files a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-5-chromium-linux.png and b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-5-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-6-chromium-linux.png b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-6-chromium-linux.png
index b03152a951..b7e9d10365 100644
Binary files a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-6-chromium-linux.png and b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-6-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-1-chromium-linux.png b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-1-chromium-linux.png
index 6b6373c059..9120ffb453 100644
Binary files a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-1-chromium-linux.png and b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-2-chromium-linux.png b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-2-chromium-linux.png
index e8835c8b0d..f08ab42b8e 100644
Binary files a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-2-chromium-linux.png and b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-3-chromium-linux.png b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-3-chromium-linux.png
index b9e76568a9..8dd2626a32 100644
Binary files a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-3-chromium-linux.png and b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-7-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-7-chromium-linux.png
index 500e5a855d..c3e8891548 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-7-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-7-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-8-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-8-chromium-linux.png
index 24708851d7..3fa4f4b867 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-8-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-8-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-9-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-9-chromium-linux.png
index 691daf55cc..8a29e36dd3 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-9-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-9-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-13-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-13-chromium-linux.png
index 9f4757beee..c7862fa5b8 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-13-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-13-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-14-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-14-chromium-linux.png
index 25f2dc3674..c141a557f5 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-14-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-14-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-15-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-15-chromium-linux.png
index b28e896877..fefcfeae1e 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-15-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-15-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-16-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-16-chromium-linux.png
index e90aff0600..d89ed53269 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-16-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-16-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-17-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-17-chromium-linux.png
index aad97410d9..2203d93552 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-17-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-17-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-18-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-18-chromium-linux.png
index 2bcc50487d..2e14e1f3cf 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-18-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-18-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-checks-the-page-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-checks-the-page-visuals-1-chromium-linux.png
index 175368bad4..785b8ed5de 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-checks-the-page-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-checks-the-page-visuals-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-checks-the-page-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-checks-the-page-visuals-2-chromium-linux.png
index 4a88793aa2..ebc1bd7c57 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-checks-the-page-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-checks-the-page-visuals-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-checks-the-page-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-checks-the-page-visuals-3-chromium-linux.png
index 82783d29f3..7c44c0bf76 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-checks-the-page-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-checks-the-page-visuals-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-split-test-transaction-1-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-split-test-transaction-1-chromium-linux.png
index cdd18f2b45..041c66f6c9 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-split-test-transaction-1-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-split-test-transaction-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-split-test-transaction-2-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-split-test-transaction-2-chromium-linux.png
index 28d4861be8..7f119fd0d4 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-split-test-transaction-2-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-split-test-transaction-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-split-test-transaction-3-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-split-test-transaction-3-chromium-linux.png
index dbb6b1f823..6a8abe9e9b 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-split-test-transaction-3-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-split-test-transaction-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-test-transaction-1-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-test-transaction-1-chromium-linux.png
index ff4b7c6e90..08cf40fbc8 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-test-transaction-1-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-test-transaction-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-test-transaction-2-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-test-transaction-2-chromium-linux.png
index 1068635d06..9b821bbc2c 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-test-transaction-2-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-test-transaction-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-test-transaction-3-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-test-transaction-3-chromium-linux.png
index 04feebc615..50b483bbef 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-test-transaction-3-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-test-transaction-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-1-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-1-chromium-linux.png
index 6a404110cd..93dd793164 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-1-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-2-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-2-chromium-linux.png
index deb4fe7870..bb06595606 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-2-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-3-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-3-chromium-linux.png
index 8871b93614..f36fe57bc4 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-3-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-4-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-4-chromium-linux.png
index e8163d34f0..95214ce382 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-4-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-4-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-5-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-5-chromium-linux.png
index 7ee7523708..886f0bc6ec 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-5-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-5-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-6-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-6-chromium-linux.png
index 0288bcf4e9..6a3756a179 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-6-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-6-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-10-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-10-chromium-linux.png
index a50e0a3207..d4a2705582 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-10-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-10-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-11-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-11-chromium-linux.png
index d9757525de..c229509aca 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-11-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-11-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-12-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-12-chromium-linux.png
index 6f855a00ba..87dac828d3 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-12-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-12-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-group-10-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-group-10-chromium-linux.png
index 6b43e273ce..d8e0617313 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-group-10-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-group-10-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-group-11-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-group-11-chromium-linux.png
index 95205c36bc..1cb2b50752 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-group-11-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-group-11-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-group-12-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-group-12-chromium-linux.png
index 376575ca39..9514c52c7b 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-group-12-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-group-12-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-payee-7-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-payee-7-chromium-linux.png
index f7922ef0c7..a4e8ce7df2 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-payee-7-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-payee-7-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-payee-8-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-payee-8-chromium-linux.png
index 82acd02f6c..219c9f2fa6 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-payee-8-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-payee-8-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-payee-9-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-payee-9-chromium-linux.png
index cb4aa1e4ee..2d7a5dac4d 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-payee-9-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-payee-9-chromium-linux.png differ
diff --git a/packages/desktop-client/src/components/mobile/MobileForms.tsx b/packages/desktop-client/src/components/mobile/MobileForms.tsx
index ef8915d1f5..4f82bbde9f 100644
--- a/packages/desktop-client/src/components/mobile/MobileForms.tsx
+++ b/packages/desktop-client/src/components/mobile/MobileForms.tsx
@@ -61,6 +61,7 @@ const iconFieldWrapperClassName = css({
flexDirection: 'row',
alignItems: 'center',
paddingLeft: 8,
+ paddingRight: 8,
gap: 8,
'&:focus-within': {
borderColor: theme.formInputBorderSelected,
@@ -68,19 +69,30 @@ const iconFieldWrapperClassName = css({
});
type InputFieldProps = ComponentPropsWithRef<typeof Input> & {
- icon?: ReactNode;
+ iconStart?: ReactNode;
+ iconEnd?: ReactNode;
+};
+
+const iconStyle: CSSProperties = {
+ color: theme.pageTextSubdued,
+ flexShrink: 0,
+ alignSelf: 'stretch',
+ alignItems: 'center',
+ justifyContent: 'center',
+ lineHeight: 0,
};
export function InputField({
disabled,
style,
onUpdate,
- icon,
+ iconStart,
+ iconEnd,
className,
ref,
...props
}: InputFieldProps) {
- if (icon) {
+ if (iconStart || iconEnd) {
return (
<View
className={iconFieldWrapperClassName}
@@ -90,18 +102,7 @@ export function InputField({
: theme.tableBackground,
}}
>
- <View
- style={{
- color: theme.pageTextSubdued,
- flexShrink: 0,
- alignSelf: 'stretch',
- alignItems: 'center',
- justifyContent: 'center',
- lineHeight: 0,
- }}
- >
- {icon}
- </View>
+ {iconStart && <View style={iconStyle}>{iconStart}</View>}
<Input
ref={ref}
autoCorrect="false"
@@ -130,6 +131,7 @@ export function InputField({
)
}
/>
+ {iconEnd && <View style={iconStyle}>{iconEnd}</View>}
</View>
);
}
diff --git a/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.tsx b/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.tsx
index 9389e72f9f..9112200957 100644
--- a/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.tsx
+++ b/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.tsx
@@ -12,7 +12,7 @@ import { Trans, useTranslation } from 'react-i18next';
import { useLocation, useParams, useSearchParams } from 'react-router';
import { Button } from '@actual-app/components/button';
-import { SvgSplit } from '@actual-app/components/icons/v0';
+import { SvgHash, SvgSplit } from '@actual-app/components/icons/v0';
import {
SvgAdd,
SvgCalendar,
@@ -521,7 +521,8 @@ const ChildTransactionEdit = forwardRef<
<FieldLabel title={t('Notes')} />
<InputField
ref={noteRef}
- icon={<SvgNotesPaper width={17} height={17} />}
+ iconStart={<SvgNotesPaper width={17} height={17} />}
+ iconEnd={<NoteInsertHashButton noteRef={noteRef} />}
placeholder={t('Add a note (optional)')}
disabled={
!!editingField &&
@@ -1372,7 +1373,7 @@ const TransactionEditInner = memo<TransactionEditInnerProps>(
<FieldLabel title={t('Date')} />
<InputField
type="date"
- icon={<SvgCalendar width={17} height={17} />}
+ iconStart={<SvgCalendar width={17} height={17} />}
disabled={
!!editingField &&
editingField !== getFieldName(transaction.id, 'date')
@@ -1418,7 +1419,8 @@ const TransactionEditInner = memo<TransactionEditInnerProps>(
<FieldLabel title={t('Notes')} />
<InputField
ref={noteRef}
- icon={<SvgNotesPaper width={17} height={17} />}
+ iconStart={<SvgNotesPaper width={17} height={17} />}
+ iconEnd={<NoteInsertHashButton noteRef={noteRef} />}
placeholder={t('Add a note (optional)')}
disabled={
!!editingField &&
@@ -1473,6 +1475,50 @@ const TransactionEditInner = memo<TransactionEditInnerProps>(
},
);
+function NoteInsertHashButton({
+ noteRef,
+}: {
+ noteRef: RefObject<HTMLInputElement | null>;
+}) {
+ const { t } = useTranslation();
+ const [inputValue, setInputValue] = useInputRefValue(noteRef);
+ const [_, setCursorPosition] = useCursorPosition(noteRef);
+
+ return (
+ <Button
+ variant="bare"
+ aria-label={t('Add tag')}
+ style={{ color: 'inherit', padding: 1 }}
+ onPointerDown={e => e.preventDefault()}
+ onClick={() => {
+ if (!noteRef.current) return;
+ const isFocused = document.activeElement === noteRef.current;
+ const start = isFocused
+ ? (noteRef.current.selectionStart ?? 0)
+ : inputValue.length;
+ const end = isFocused
+ ? (noteRef.current.selectionEnd ?? 0)
+ : inputValue.length;
+
+ const before = inputValue.substring(0, start);
+ const after = inputValue.substring(end);
+
+ const space = start === 0 || before.match(/\s$/) ? '' : ' ';
+
+ setInputValue(before + space + '#' + after);
+ noteRef.current.focus();
+ setCursorPosition(start + 1 + space.length);
+ // so Safari requires that I do noteRef.current.focus() synchronously,
+ // but Chrome doesn't work unless I do it after. We do both this way.
+ // If the element is already focused, these invocations have no effect
+ setTimeout(() => noteRef.current?.focus(), 1);
+ }}
+ >
+ <SvgHash width={17} height={17} />
+ </Button>
+ );
+}
+
function NoteTagAutocomplete({
inputRef,
}: {
diff --git a/packages/desktop-client/src/components/tags/ManageTags.tsx b/packages/desktop-client/src/components/tags/ManageTags.tsx
index b4a406ba8b..99d81d808a 100644
--- a/packages/desktop-client/src/components/tags/ManageTags.tsx
+++ b/packages/desktop-client/src/components/tags/ManageTags.tsx
@@ -68,13 +68,13 @@ export function ManageTags() {
<Trans>Add New</Trans>
</Button>
<View style={{ flex: 1 }} />
- <SelectedTagsButton />
- <TagsMenuButton />
<Search
placeholder={t('Filter tags...')}
value={filter}
onChange={setFilter}
/>
+ <SelectedTagsButton />
+ <TagsMenuButton />
</SpaceBetween>
<View style={{ marginTop: 12, ...styles.tableContainer }}>
<TagsHeader />
diff --git a/packages/desktop-client/src/hooks/useTagCSS.ts b/packages/desktop-client/src/hooks/useTagCSS.ts
index 09e6d4806e..039a1100c5 100644
--- a/packages/desktop-client/src/hooks/useTagCSS.ts
+++ b/packages/desktop-client/src/hooks/useTagCSS.ts
@@ -31,6 +31,7 @@ export function useTagCSS(opts?: { ellipsis?: boolean }) {
textOverflow: 'ellipsis',
maxWidth: '100%',
display: 'inline-block',
+ whiteSpace: 'nowrap',
}
: { display: 'inline-flex' }),
opacity: tagObj?.hidden ? 0.5 : undefined,
diff --git a/packages/loot-core/src/mocks/budget.ts b/packages/loot-core/src/mocks/budget.ts
index 4d9636a22e..1aa2260e87 100644
--- a/packages/loot-core/src/mocks/budget.ts
+++ b/packages/loot-core/src/mocks/budget.ts
@@ -24,6 +24,127 @@ import type { CategoryGroupDefinition } from '.';
type MockPayeeEntity = Partial<PayeeEntity> & { bill?: boolean };
+const DEMO_TAGS = [
+ { tag: 'groceries', color: '#388E3C', description: 'Kroger & Publix trips' },
+ {
+ tag: 'dining-out',
+ color: '#FFA000',
+ description: 'Restaurants and takeout',
+ },
+ {
+ tag: 'online-shopping',
+ color: '#1976D2',
+ description: 'Online store purchases',
+ },
+ {
+ tag: 'entertainment',
+ color: '#7B1FA2',
+ description: 'Movies, activities, fun',
+ },
+ {
+ tag: 'home-improvement',
+ color: '#5D4037',
+ description: 'Home Depot, repairs, DIY',
+ },
+ {
+ tag: 'utilities',
+ color: '#D32F2F',
+ description: 'Power, water, internet, phone',
+ },
+ { tag: 'subscription', color: '#455A64', description: 'Recurring services' },
+ { tag: 'medical', color: '#C2185B', description: 'Healthcare expenses' },
+ { tag: 'gift', color: '#C39DDF', description: 'Gifts given or received' },
+ { tag: 'clothing', color: '#E64A19', description: 'Apparel purchases' },
+ {
+ tag: 'retirement',
+ color: '#00796B',
+ description: '401k and IRA contributions',
+ },
+ { tag: 'mortgage', color: '#616161', description: 'Housing payments' },
+ { tag: 'emergency', color: '#F57C00', description: 'Unexpected expenses' },
+ { tag: 'income', color: '#689F38', description: 'Paychecks and deposits' },
+ { tag: 'splurge', color: '#512DA8', description: 'Treat yourself purchases' },
+ {
+ tag: 'reimbursable',
+ color: '#0097A7',
+ description: 'Expenses to be paid back',
+ },
+ {
+ tag: 'tax-deductible',
+ color: '#AFB42B',
+ description: 'Potentially deductible items',
+ },
+];
+
+function getTagNotes(
+ payeeName: string,
+ categoryName: string,
+ amount: number,
+ accountName?: string,
+): string {
+ const tags: string[] = [];
+
+ if (payeeName === 'Kroger' || payeeName === 'Publix') {
+ tags.push('#groceries');
+ } else if (payeeName === 'Home Depot') {
+ tags.push('#home-improvement');
+ } else if (payeeName === 'Movies') {
+ tags.push('#entertainment');
+ } else if (payeeName === 'Online store') {
+ tags.push('#online-shopping');
+ } else if (payeeName === 'Dominion Power') {
+ tags.push('#utilities');
+ } else if (payeeName === 'Extra Watery') {
+ tags.push('#utilities');
+ } else if (payeeName === 'Housy House') {
+ tags.push('#mortgage');
+ } else if (payeeName === 'Fast Internet' || payeeName === 'T-mobile') {
+ tags.push('#subscription');
+ tags.push('#utilities');
+ } else if (payeeName === 'Deposit') {
+ if (accountName === 'Vanguard 401k' || accountName === 'Roth IRA') {
+ tags.push('#retirement');
+ } else {
+ tags.push('#income');
+ }
+ }
+
+ if (
+ (categoryName === 'Entertainment' || categoryName === 'Clothing') &&
+ Math.abs(amount) > 5000
+ ) {
+ tags.push('#splurge');
+ }
+
+ return tags.join(' ');
+}
+
+function getChildTagNotes(categoryName: string, amount: number): string {
+ const tags: string[] = [];
+
+ if (categoryName === 'Food') tags.push('#groceries');
+ else if (categoryName === 'Restaurants') tags.push('#dining-out');
+ else if (categoryName === 'Entertainment') tags.push('#entertainment');
+ else if (categoryName === 'Clothing') tags.push('#clothing');
+ else if (categoryName === 'Medical') tags.push('#medical');
+ else if (categoryName === 'Gift') tags.push('#gift');
+
+ if (
+ (categoryName === 'Entertainment' || categoryName === 'Clothing') &&
+ Math.abs(amount) > 5000
+ ) {
+ tags.push('#splurge');
+ }
+
+ return tags.join(' ');
+}
+
+async function insertDemoTags(handlers: Handlers) {
+ for (const tagDef of DEMO_TAGS) {
+ await handlers['tags-create'](tagDef);
+ }
+}
+
function pickRandom<T>(list: T[]): T {
return list[Math.floor(random() * list.length) % list.length];
}
@@ -134,36 +255,53 @@ async function fillPrimaryChecking(
account: account.id,
date: currentDate,
category: category.id,
+ notes: getTagNotes(payee.name, category.name, amount, account.name),
};
transactions.push(transaction);
if (random() < 0.2) {
const a = Math.round(transaction.amount / 3);
- const pick = () =>
+ const pickCat = () =>
payee === incomePayee
- ? incomeGroup.categories.find(c => c.name === 'Income').id
- : pickRandom(expenseCategories).id;
+ ? incomeGroup.categories.find(c => c.name === 'Income')
+ : pickRandom(expenseCategories);
+ const childCategories = [pickCat(), pickCat(), pickCat()];
transaction.subtransactions = [
{
id: uuidv4(),
date: currentDate,
account: account.id,
amount: a,
- category: pick(),
+ category: childCategories[0].id,
+ notes:
+ payee === incomePayee
+ ? '#income'
+ : getChildTagNotes(childCategories[0].name, a),
},
{
id: uuidv4(),
date: currentDate,
account: account.id,
amount: a,
- category: pick(),
+ category: childCategories[1].id,
+ notes:
+ payee === incomePayee
+ ? '#income'
+ : getChildTagNotes(childCategories[1].name, a),
},
{
id: uuidv4(),
date: currentDate,
account: account.id,
amount: transaction.amount - a * 2,
- category: pick(),
+ category: childCategories[2].id,
+ notes:
+ payee === incomePayee
+ ? '#income'
+ : getChildTagNotes(
+ childCategories[2].name,
+ transaction.amount - a * 2,
+ ),
},
];
}
@@ -186,6 +324,7 @@ async function fillPrimaryChecking(
account: account.id,
date,
category: billCategories.find(c => c.name === 'Power').id,
+ notes: '#utilities',
});
}
@@ -197,6 +336,7 @@ async function fillPrimaryChecking(
account: account.id,
date,
category: billCategories.find(c => c.name === 'Water').id,
+ notes: '#utilities',
});
}
@@ -208,6 +348,7 @@ async function fillPrimaryChecking(
account: account.id,
date,
category: billCategories.find(c => c.name === 'Mortgage').id,
+ notes: '#mortgage',
});
}
@@ -220,6 +361,7 @@ async function fillPrimaryChecking(
account: account.id,
date,
category: billCategories.find(c => c.name === 'Internet').id,
+ notes: '#subscription #utilities',
});
}
@@ -232,6 +374,7 @@ async function fillPrimaryChecking(
account: account.id,
date,
category: billCategories.find(c => c.name === 'Cell').id,
+ notes: '#subscription #utilities',
});
}
}
@@ -285,6 +428,7 @@ async function fillChecking(handlers, account, payees, groups) {
account: account.id,
date: monthUtils.subDays(monthUtils.currentDay(), i * 2),
category: category.id,
+ notes: getTagNotes(payee.name, category.name, amount, account.name),
});
}
@@ -321,6 +465,7 @@ async function fillInvestment(handlers, account, payees, groups) {
account: account.id,
date: monthUtils.subDays(monthUtils.currentDay(), integer(10, 360)),
category: category.id,
+ notes: getTagNotes(payee.name, category.name, amount, account.name),
});
}
@@ -366,6 +511,7 @@ async function fillSavings(handlers, account, payees, groups) {
account: account.id,
date: monthUtils.subDays(monthUtils.currentDay(), i * 5),
category: category.id,
+ notes: getTagNotes(payee.name, category.name, amount, account.name),
});
}
@@ -399,6 +545,7 @@ async function fillMortgage(handlers, account, payees, groups) {
date:
monthUtils.subMonths(monthUtils.currentDay(), numTransactions) + '-02',
category: getStartingBalanceCat(incomeGroup.categories),
+ notes: '#mortgage',
starting_balance_flag: true,
},
];
@@ -411,6 +558,7 @@ async function fillMortgage(handlers, account, payees, groups) {
account: account.id,
date: monthUtils.subMonths(monthUtils.currentDay(), i) + '-02',
category: category.id,
+ notes: '#mortgage',
starting_balance_flag: true,
});
}
@@ -450,6 +598,7 @@ async function fillOther(handlers, account, payees, groups) {
account: account.id,
date: monthUtils.subMonths(monthUtils.currentDay(), i) + '-02',
category: category.id,
+ notes: getTagNotes(payee.name, category.name, amount, account.name),
});
}
@@ -721,6 +870,12 @@ export async function createTestBudget(handlers: Handlers) {
setSyncingMode('import');
+ await runMutator(() =>
+ batchMessages(async () => {
+ await insertDemoTags(handlers);
+ }),
+ );
+
await runMutator(() =>
batchMessages(async () => {
for (const account of accounts) {
diff --git a/upcoming-release-notes/add-tag-button-mobile.md b/upcoming-release-notes/add-tag-button-mobile.md
new file mode 100644
index 0000000000..acc7f6454d
--- /dev/null
+++ b/upcoming-release-notes/add-tag-button-mobile.md
@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [alecbakholdin]
+---
+
+Added button to mobile transaction edit to allow easier access to # in mobile, and added tags to demo budget