diff --git a/packages/desktop-client/src/components/filters/FilterExpression.tsx b/packages/desktop-client/src/components/filters/FilterExpression.tsx index f791020ae9..adc7556519 100644 --- a/packages/desktop-client/src/components/filters/FilterExpression.tsx +++ b/packages/desktop-client/src/components/filters/FilterExpression.tsx @@ -131,9 +131,23 @@ export function FilterExpression({ return false; } + if ( + element instanceof HTMLElement && + (element.closest('[data-testid="account-autocomplete-modal"]') || + element.closest('[data-testid="payee-autocomplete-modal"]') || + element.closest('[data-testid="category-autocomplete-modal"]')) + ) { + return false; + } + return true; }} - style={{ width: 275, padding: 15, color: theme.menuItemText }} + style={{ + width: 275, + padding: 15, + color: theme.menuItemText, + zIndex: '2500 !important', + }} data-testid="filters-menu-tooltip" > ({ return false; } + if ( + element instanceof HTMLElement && + (element.closest('[data-testid="account-autocomplete-modal"]') || + element.closest('[data-testid="payee-autocomplete-modal"]') || + element.closest('[data-testid="category-autocomplete-modal"]')) + ) { + return false; + } + return true; }} - style={{ width: 275, padding: 15, color: theme.menuItemText }} + style={{ + width: 275, + padding: 15, + color: theme.menuItemText, + zIndex: '2500 !important', + }} data-testid="filters-menu-tooltip" > {state.field && ( diff --git a/upcoming-release-notes/6741.md b/upcoming-release-notes/6741.md new file mode 100644 index 0000000000..4bd9b90829 --- /dev/null +++ b/upcoming-release-notes/6741.md @@ -0,0 +1,6 @@ +--- +category: Bugfixes +authors: [mnil] +--- + +When filtering for accounts in e.g. the net worth graph the modal closes the filter tooltip so it's impossible to add e.g. accounts to the filter.