Skip to content

A local-first personal finance app

Fix display of link schedules condition (#5529)

Matiss Janis Aboltins8fcaff8e3ae1
diff --git a/packages/component-library/src/View.tsx b/packages/component-library/src/View.tsx
index 5c97609800..1831c2792d 100644
--- a/packages/component-library/src/View.tsx
+++ b/packages/component-library/src/View.tsx
@@ -23,7 +23,11 @@ export const View = forwardRef<HTMLDivElement, ViewProps>((props, ref) => {
{...restProps}
ref={innerRef ?? ref}
style={nativeStyle}
- className={cx('view', className, css(style))}
+ className={cx(
+ 'view',
+ className,
+ style && Object.keys(style).length > 0 ? css(style) : undefined,
+ )}
/>
);
});
diff --git a/packages/desktop-client/src/components/rules/RuleEditor.tsx b/packages/desktop-client/src/components/rules/RuleEditor.tsx
index c361d32fea..71ebac1358 100644
--- a/packages/desktop-client/src/components/rules/RuleEditor.tsx
+++ b/packages/desktop-client/src/components/rules/RuleEditor.tsx
@@ -22,6 +22,7 @@ import {
} from '@actual-app/components/icons/v1';
import { Menu } from '@actual-app/components/menu';
import { Select } from '@actual-app/components/select';
+import { SpaceBetween } from '@actual-app/components/space-between';
import { Stack } from '@actual-app/components/stack';
import { styles } from '@actual-app/components/styles';
import { Text } from '@actual-app/components/text';
@@ -391,33 +392,41 @@ function ScheduleDescription({ id }) {
const status = schedule && statusLabels.get(schedule.id);
return (
- <View style={{ flex: 1, flexDirection: 'row', alignItems: 'center' }}>
- <View style={{ marginRight: 15, flexDirection: 'row' }}>
- <Text
- style={{
- whiteSpace: 'nowrap',
- overflow: 'hidden',
- textOverflow: 'ellipsis',
- }}
- >
- <Trans>Payee:</Trans>{' '}
+ <View
+ style={{
+ flex: 1,
+ flexDirection: 'row',
+ alignItems: 'center',
+ justifyContent: 'space-between',
+ }}
+ >
+ <SpaceBetween
+ gap={5}
+ style={{
+ marginRight: 15,
+ }}
+ >
+ <SpaceBetween gap={5} style={{ flexWrap: 'nowrap' }}>
+ <Trans>Payee:</Trans>
<DisplayId
type="payees"
id={schedule._payee}
noneColor={theme.pageTextLight}
/>
- </Text>
- <Text style={{ margin: '0 5px' }}> — </Text>
+ </SpaceBetween>
+
<Text style={{ flexShrink: 0 }}>
+ <Text> — </Text>
<Trans>Amount:</Trans> {formatAmount(schedule._amount)}
</Text>
- <Text style={{ margin: '0 5px' }}> — </Text>
+
<Text style={{ flexShrink: 0 }}>
+ <Text> — </Text>
<Trans>
Next: {{ month: monthUtils.format(schedule.next_date, dateFormat) }}
</Trans>
</Text>
- </View>
+ </SpaceBetween>
{/* @ts-expect-error fix this */}
<StatusBadge status={status} />
</View>
diff --git a/upcoming-release-notes/5529.md b/upcoming-release-notes/5529.md
new file mode 100644
index 0000000000..64818def11
--- /dev/null
+++ b/upcoming-release-notes/5529.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [MatissJanis]
+---
+
+Fix the display of 'link schedules' condition