Skip to content

A local-first personal finance app

fixed:issue->#1762 Schedule creation modal notify user of weekend skip option (#1840)

Seth Gilletta549cdf0e796
diff --git a/packages/loot-core/src/shared/schedules.ts b/packages/loot-core/src/shared/schedules.ts
index fd0dea9885..a6396b93b1 100644
--- a/packages/loot-core/src/shared/schedules.ts
+++ b/packages/loot-core/src/shared/schedules.ts
@@ -66,17 +66,21 @@ function prettyDayName(day) {
export function getRecurringDescription(config) {
let interval = config.interval || 1;
+ let weekendSolveSuffix = config.skipWeekend
+ ? ` (${config.weekendSolveMode} weekend) `
+ : '';
+
switch (config.frequency) {
case 'daily': {
let desc = 'Every ';
desc += interval !== 1 ? `${interval} days` : 'day';
- return desc;
+ return desc + weekendSolveSuffix;
}
case 'weekly': {
let desc = 'Every ';
desc += interval !== 1 ? `${interval} weeks` : 'week';
desc += ' on ' + monthUtils.format(config.start, 'EEEE');
- return desc;
+ return desc + weekendSolveSuffix;
}
case 'monthly': {
let desc = 'Every ';
@@ -145,13 +149,13 @@ export function getRecurringDescription(config) {
desc += ' on the ' + monthUtils.format(config.start, 'do');
}
- return desc;
+ return desc + weekendSolveSuffix;
}
case 'yearly': {
let desc = 'Every ';
desc += interval !== 1 ? `${interval} years` : 'year';
desc += ' on ' + monthUtils.format(config.start, 'LLL do');
- return desc;
+ return desc + weekendSolveSuffix;
}
default:
return 'Recurring error';
diff --git a/upcoming-release-notes/1840.md b/upcoming-release-notes/1840.md
new file mode 100644
index 0000000000..4d7462a2bb
--- /dev/null
+++ b/upcoming-release-notes/1840.md
@@ -0,0 +1,5 @@
+---
+category: Bugfix
+authors: [sethgillett]
+---
+Schedule creation modal notify user of weekend skip option