A local-first personal finance app
Allow escaping tags with double ##. (#3246)
Robert Dyera1ca871b24df
diff --git a/packages/desktop-client/src/components/transactions/TransactionList.jsx b/packages/desktop-client/src/components/transactions/TransactionList.jsxindex 137cc61bc5..9b3eb7895f 100644--- a/packages/desktop-client/src/components/transactions/TransactionList.jsx+++ b/packages/desktop-client/src/components/transactions/TransactionList.jsx@@ -192,7 +192,7 @@ export function TransactionList({onApplyFilter({field: 'notes',op: 'matches',- value: `(^|\\s|\\w|#)${escapeRegExp(tag)}($|\\s|#)`,+ value: `(^|\\s|\\w)${escapeRegExp(tag)}($|\\s|#)`,type: 'string',});});diff --git a/packages/desktop-client/src/components/transactions/TransactionsTable.jsx b/packages/desktop-client/src/components/transactions/TransactionsTable.jsxindex b5a445ea90..c421da17e5 100644--- a/packages/desktop-client/src/components/transactions/TransactionsTable.jsx+++ b/packages/desktop-client/src/components/transactions/TransactionsTable.jsx@@ -2494,6 +2494,7 @@ function notesTagFormatter(notes, onNotesTagClick) {{words.map((word, i, arr) => {const separator = arr.length - 1 === i ? '' : ' ';if (word.includes('#') && word.length > 1) {+ let lastEmptyTag = -1;// Treat tags in a single word as separate tags.// #tag1#tag2 => (#tag1)(#tag2)// not-a-tag#tag2#tag3 => not-a-tag(#tag2)(#tag3)@@ -2503,9 +2504,15 @@ function notesTagFormatter(notes, onNotesTagClick) {}if (!tag) {+ lastEmptyTag = ti;return '#';}+ if (lastEmptyTag === ti - 1) {+ return `${tag} `;+ }+ lastEmptyTag = -1;+const validTag = `#${tag}`;return (<span key={`${validTag}${ti}`}>diff --git a/packages/loot-core/src/server/accounts/sync.ts b/packages/loot-core/src/server/accounts/sync.tsindex b83c5ddd6d..cf2e25197d 100644--- a/packages/loot-core/src/server/accounts/sync.ts+++ b/packages/loot-core/src/server/accounts/sync.ts@@ -272,6 +272,10 @@ async function normalizeBankSyncTransactions(transactions, acctId) {trans.cleared = Boolean(trans.booked);+ const notes =+ trans.remittanceInformationUnstructured ||+ (trans.remittanceInformationUnstructuredArray || []).join(', ');+normalized.push({payee_name: trans.payeeName,trans: {@@ -279,9 +283,7 @@ async function normalizeBankSyncTransactions(transactions, acctId) {payee: trans.payee,account: trans.account,date: trans.date,- notes:- trans.remittanceInformationUnstructured ||- (trans.remittanceInformationUnstructuredArray || []).join(', '),+ notes: notes.trim().replace('#', '##'),imported_id: trans.transactionId,imported_payee: trans.imported_payee,cleared: trans.cleared,diff --git a/upcoming-release-notes/3246.md b/upcoming-release-notes/3246.mdnew file mode 100644index 0000000000..6a03af438f--- /dev/null+++ b/upcoming-release-notes/3246.md@@ -0,0 +1,6 @@+---+category: Enhancements+authors: [psybers]+---++Allow escaping tags with double ##.