+
{customName ? (
{customName}
) : (
diff --git a/packages/desktop-client/src/components/filters/FiltersButton.tsx b/packages/desktop-client/src/components/filters/FiltersButton.tsx
index 595a4cb4fa..1568986f0a 100644
--- a/packages/desktop-client/src/components/filters/FiltersButton.tsx
+++ b/packages/desktop-client/src/components/filters/FiltersButton.tsx
@@ -6,7 +6,10 @@ import { Button } from '../common/Button2';
export function FiltersButton({ onPress }: { onPress: () => void }) {
return (
);
}
diff --git a/packages/desktop-client/src/components/reports/Header.tsx b/packages/desktop-client/src/components/reports/Header.tsx
index 7c4705976a..c2ee67bb40 100644
--- a/packages/desktop-client/src/components/reports/Header.tsx
+++ b/packages/desktop-client/src/components/reports/Header.tsx
@@ -10,6 +10,7 @@ import { useFeatureFlag } from '../../hooks/useFeatureFlag';
import { useResponsive } from '../../ResponsiveProvider';
import { Button } from '../common/Button2';
import { Select } from '../common/Select';
+import { SpaceBetween } from '../common/SpaceBetween';
import { View } from '../common/View';
import { AppliedFilters } from '../filters/AppliedFilters';
import { FilterButton } from '../filters/FiltersMenu';
@@ -66,82 +67,69 @@ export function Header({
-
- {isDashboardsFeatureEnabled && mode && (
-
- )}
-
-
-
+ end,
+ mode: newMode,
+ });
-
+ onChangeDates(newStart, newEnd, newMode);
+ }}
+ >
+ {mode === 'static' ? 'Static' : 'Live'}
+
+ )}
+
+
+
+
+
+
{show1Month && (
)}
-
+
{children ? (
)}
-
+
{filters && filters.length > 0 && (
diff --git a/packages/desktop-client/src/components/reports/ModeButton.tsx b/packages/desktop-client/src/components/reports/ModeButton.tsx
index 8a35546d77..fc50a14a03 100644
--- a/packages/desktop-client/src/components/reports/ModeButton.tsx
+++ b/packages/desktop-client/src/components/reports/ModeButton.tsx
@@ -25,7 +25,6 @@ export function ModeButton({
css({
padding: '5px 10px',
backgroundColor: theme.menuBackground,
- marginRight: 5,
fontSize: 'inherit',
...style,
...(selected && {
diff --git a/packages/desktop-client/src/components/reports/ReportSidebar.tsx b/packages/desktop-client/src/components/reports/ReportSidebar.tsx
index 0c07319a88..011739c5a3 100644
--- a/packages/desktop-client/src/components/reports/ReportSidebar.tsx
+++ b/packages/desktop-client/src/components/reports/ReportSidebar.tsx
@@ -14,6 +14,7 @@ import { Button } from '../common/Button2';
import { Menu } from '../common/Menu';
import { Popover } from '../common/Popover';
import { Select, type SelectOption } from '../common/Select';
+import { SpaceBetween } from '../common/SpaceBetween';
import { Text } from '../common/Text';
import { Tooltip } from '../common/Tooltip';
import { View } from '../common/View';
@@ -177,16 +178,13 @@ export function ReportSidebar({
Display
-
-
- Mode:
-
+ Mode:
onChangeMode('total')}
@@ -199,7 +197,7 @@ export function ReportSidebar({
>
Time
-
+
-
@@ -430,7 +427,7 @@ export function ReportSidebar({
>
Static
-
+
{!customReportItems.isDateStatic ? (
+
{' '}
- {
- setSessionReport('conditions', [
- ...(customReportItems.conditions ?? []),
- e,
- ]);
- onApplyFilter(e);
- onReportChange({ type: 'modify' });
+ />
+
+
-
-
+ >
+ {
+ setSessionReport('conditions', [
+ ...(customReportItems.conditions ?? []),
+ e,
+ ]);
+ onApplyFilter(e);
+ onReportChange({ type: 'modify' });
+ }}
+ exclude={[]}
+ />
+
+
);
}
diff --git a/packages/desktop-client/src/components/reports/reports/CustomReport.tsx b/packages/desktop-client/src/components/reports/reports/CustomReport.tsx
index 346983de07..a3a438b090 100644
--- a/packages/desktop-client/src/components/reports/reports/CustomReport.tsx
+++ b/packages/desktop-client/src/components/reports/reports/CustomReport.tsx
@@ -727,7 +727,6 @@ export function CustomReport() {
marginLeft: 5,
marginRight: 5,
gap: 10,
- alignItems: 'flex-start',
flexShrink: 0,
}}
>
diff --git a/packages/desktop-client/src/components/reports/reports/Spending.tsx b/packages/desktop-client/src/components/reports/reports/Spending.tsx
index 8ccd573a19..39be69e0e2 100644
--- a/packages/desktop-client/src/components/reports/reports/Spending.tsx
+++ b/packages/desktop-client/src/components/reports/reports/Spending.tsx
@@ -23,6 +23,7 @@ import { Block } from '../../common/Block';
import { Button } from '../../common/Button2';
import { Paragraph } from '../../common/Paragraph';
import { Select } from '../../common/Select';
+import { SpaceBetween } from '../../common/SpaceBetween';
import { Text } from '../../common/Text';
import { Tooltip } from '../../common/Tooltip';
import { View } from '../../common/View';
@@ -235,13 +236,7 @@ function SpendingInternal({ widget }: SpendingInternalProps) {
}}
>
{!isNarrowWidth && (
-
+
{isDashboardsFeatureEnabled && (
<>
)}
-
+
Compare
@@ -305,7 +293,7 @@ function SpendingInternal({ widget }: SpendingInternalProps) {
style={{ width: 150 }}
popoverStyle={{ width: 150 }}
/>
-
+
-
+
Average
-
+
)}
-
+
)}
{conditions && conditions.length > 0 && (
diff --git a/upcoming-release-notes/3636.md b/upcoming-release-notes/3636.md
new file mode 100644
index 0000000000..5a708dde79
--- /dev/null
+++ b/upcoming-release-notes/3636.md
@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [MatissJanis]
+---
+
+Reports: responsibility UI polishing.