From 5686009ceecaec60e65bee4c764d618c7599b5ac Mon Sep 17 00:00:00 2001
From: SamBobBarnes <samuelrbarnes@outlook.com>
Date: Mon, 20 Jan 2025 10:32:32 -0600
Subject: [PATCH 01/11] save button

---
 .../components/schedules/UpcomingLength.tsx   | 43 +++++++++++++++++--
 1 file changed, 39 insertions(+), 4 deletions(-)

diff --git a/packages/desktop-client/src/components/schedules/UpcomingLength.tsx b/packages/desktop-client/src/components/schedules/UpcomingLength.tsx
index 5195110eee3..57cb90569c7 100644
--- a/packages/desktop-client/src/components/schedules/UpcomingLength.tsx
+++ b/packages/desktop-client/src/components/schedules/UpcomingLength.tsx
@@ -1,9 +1,10 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 
 import { type SyncedPrefs } from 'loot-core/types/prefs';
 
 import { useSyncedPref } from '../../hooks/useSyncedPref';
+import { Button } from '../common/Button2';
 import { Modal, ModalCloseButton, ModalHeader } from '../common/Modal';
 import { Paragraph } from '../common/Paragraph';
 import { Select } from '../common/Select';
@@ -20,7 +21,7 @@ function useUpcomingLengthOptions() {
     { value: '7', label: t('1 week') },
     { value: '14', label: t('2 weeks') },
     { value: 'oneMonth', label: t('1 month') },
-    { value: 'currentMonth', label: t('end of the current month') },
+    { value: 'currentMonth', label: t('End of the current month') },
   ];
 
   return { upcomingLengthOptions };
@@ -32,10 +33,25 @@ export function UpcomingLength() {
     'upcomingScheduledTransactionLength',
   );
 
+  const saveUpcomingLength = () => {
+    setUpcomingLength(tempUpcomingLength);
+  };
+
   const { upcomingLengthOptions } = useUpcomingLengthOptions();
 
   const upcomingLength = _upcomingLength || '7';
 
+  const [tempUpcomingLength, setTempUpcomingLength] = useState(upcomingLength);
+  const [saveActive, setSaveActive] = useState(false);
+
+  useEffect(() => {
+    if (tempUpcomingLength !== upcomingLength) {
+      setSaveActive(true);
+    } else {
+      setSaveActive(false);
+    }
+  }, [tempUpcomingLength, upcomingLength]);
+
   return (
     <Modal
       name="schedules-upcoming-length"
@@ -65,10 +81,29 @@ export function UpcomingLength() {
                 x.value || '7',
                 x.label,
               ])}
-              value={upcomingLength}
-              onChange={newValue => setUpcomingLength(newValue)}
+              value={tempUpcomingLength}
+              onChange={newValue => {
+                setTempUpcomingLength(newValue);
+              }}
             />
           </View>
+          <div
+            style={{
+              display: 'flex',
+              flexDirection: 'row',
+              justifyContent: 'end',
+              marginTop: 20,
+            }}
+          >
+            <Button
+              isDisabled={!saveActive}
+              onPress={saveUpcomingLength}
+              type="submit"
+              variant="primary"
+            >
+              <Trans>Save</Trans>
+            </Button>
+          </div>
         </>
       )}
     </Modal>

From 97e6c5dc3e7d3ad95642019a526c1a7ffa22a9de Mon Sep 17 00:00:00 2001
From: SamBobBarnes <samuelrbarnes@outlook.com>
Date: Mon, 20 Jan 2025 10:37:10 -0600
Subject: [PATCH 02/11] release notes

---
 upcoming-release-notes/4206.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 upcoming-release-notes/4206.md

diff --git a/upcoming-release-notes/4206.md b/upcoming-release-notes/4206.md
new file mode 100644
index 00000000000..e9b1929f737
--- /dev/null
+++ b/upcoming-release-notes/4206.md
@@ -0,0 +1,6 @@
+---
+category: Features
+authors: [ SamBobBarnes ]
+---
+
+Add option for custom upcoming length

From d21444a1bf13963ecb6efb2878dbb581e02e3e3c Mon Sep 17 00:00:00 2001
From: SamBobBarnes <samuelrbarnes@outlook.com>
Date: Mon, 20 Jan 2025 10:45:07 -0600
Subject: [PATCH 03/11] custom component shows

---
 .../schedules/CustomUpcomingLength.tsx         | 18 ++++++++++++++++++
 .../components/schedules/UpcomingLength.tsx    | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 packages/desktop-client/src/components/schedules/CustomUpcomingLength.tsx

diff --git a/packages/desktop-client/src/components/schedules/CustomUpcomingLength.tsx b/packages/desktop-client/src/components/schedules/CustomUpcomingLength.tsx
new file mode 100644
index 00000000000..506ab526d73
--- /dev/null
+++ b/packages/desktop-client/src/components/schedules/CustomUpcomingLength.tsx
@@ -0,0 +1,18 @@
+import { Paragraph } from '../common/Paragraph';
+import { View } from '../common/View';
+
+type CustomUpcomingLengthProps = {
+  onChange: (value: string) => void;
+  tempValue: string;
+};
+
+export function CustomUpcomingLength({
+  onChange,
+  tempValue,
+}: CustomUpcomingLengthProps) {
+  return (
+    <View>
+      <Paragraph>Temp:{tempValue}</Paragraph>
+    </View>
+  );
+}
diff --git a/packages/desktop-client/src/components/schedules/UpcomingLength.tsx b/packages/desktop-client/src/components/schedules/UpcomingLength.tsx
index 57cb90569c7..b7d579623c0 100644
--- a/packages/desktop-client/src/components/schedules/UpcomingLength.tsx
+++ b/packages/desktop-client/src/components/schedules/UpcomingLength.tsx
@@ -10,6 +10,8 @@ import { Paragraph } from '../common/Paragraph';
 import { Select } from '../common/Select';
 import { View } from '../common/View';
 
+import { CustomUpcomingLength } from './CustomUpcomingLength';
+
 function useUpcomingLengthOptions() {
   const { t } = useTranslation();
 
@@ -22,11 +24,16 @@ function useUpcomingLengthOptions() {
     { value: '14', label: t('2 weeks') },
     { value: 'oneMonth', label: t('1 month') },
     { value: 'currentMonth', label: t('End of the current month') },
+    { value: 'custom', label: t('Custom length') },
   ];
 
   return { upcomingLengthOptions };
 }
 
+function nonCustomUpcomingLengthValues() {
+  return ['1', '7', '14', 'oneMonth', 'currentMonth'];
+}
+
 export function UpcomingLength() {
   const { t } = useTranslation();
   const [_upcomingLength, setUpcomingLength] = useSyncedPref(
@@ -42,6 +49,10 @@ export function UpcomingLength() {
   const upcomingLength = _upcomingLength || '7';
 
   const [tempUpcomingLength, setTempUpcomingLength] = useState(upcomingLength);
+  const [useCustomLength, setUseCustomLength] = useState(
+    nonCustomUpcomingLengthValues().findIndex(x => x === tempUpcomingLength) ===
+      -1,
+  );
   const [saveActive, setSaveActive] = useState(false);
 
   useEffect(() => {
@@ -83,9 +94,16 @@ export function UpcomingLength() {
               ])}
               value={tempUpcomingLength}
               onChange={newValue => {
+                setUseCustomLength(newValue === 'custom');
                 setTempUpcomingLength(newValue);
               }}
             />
+            {useCustomLength && (
+              <CustomUpcomingLength
+                onChange={setTempUpcomingLength}
+                tempValue={tempUpcomingLength}
+              />
+            )}
           </View>
           <div
             style={{

From a21c4d45d2b5bcc3bcb7f3eb1f1cb0575eaa5979 Mon Sep 17 00:00:00 2001
From: SamBobBarnes <samuelrbarnes@outlook.com>
Date: Mon, 20 Jan 2025 11:06:52 -0600
Subject: [PATCH 04/11] custom input and saving working

---
 .../schedules/CustomUpcomingLength.tsx        | 50 +++++++++++++++++--
 .../components/schedules/UpcomingLength.tsx   | 16 ++++--
 2 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/packages/desktop-client/src/components/schedules/CustomUpcomingLength.tsx b/packages/desktop-client/src/components/schedules/CustomUpcomingLength.tsx
index 506ab526d73..3b03d69ec70 100644
--- a/packages/desktop-client/src/components/schedules/CustomUpcomingLength.tsx
+++ b/packages/desktop-client/src/components/schedules/CustomUpcomingLength.tsx
@@ -1,5 +1,8 @@
-import { Paragraph } from '../common/Paragraph';
-import { View } from '../common/View';
+import React, { useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { Input } from '../common/Input';
+import { Select } from '../common/Select';
 
 type CustomUpcomingLengthProps = {
   onChange: (value: string) => void;
@@ -10,9 +13,46 @@ export function CustomUpcomingLength({
   onChange,
   tempValue,
 }: CustomUpcomingLengthProps) {
+  const { t } = useTranslation();
+
+  const options = [
+    { value: 'day', label: t('Days') },
+    { value: 'week', label: t('Weeks') },
+    { value: 'month', label: t('Months') },
+    { value: 'year', label: t('Years') },
+  ];
+
+  let timePeriod = [];
+  if (tempValue === 'custom') {
+    timePeriod = ['1', 'day'];
+  } else {
+    timePeriod = tempValue.split('-');
+  }
+
+  const [numValue, setNumValue] = useState(parseInt(timePeriod[0]));
+  const [unit, setUnit] = useState(timePeriod[1]);
+
+  useEffect(() => {
+    onChange(`${numValue}-${unit}`);
+  }, [numValue, onChange, unit]);
+
   return (
-    <View>
-      <Paragraph>Temp:{tempValue}</Paragraph>
-    </View>
+    <div
+      style={{ display: 'flex', alignItems: 'center', gap: 5, marginTop: 10 }}
+    >
+      <Input
+        id="length"
+        style={{ width: 40 }}
+        type="number"
+        min={numValue}
+        onChange={e => setNumValue(parseInt(e.target.value))}
+        defaultValue={numValue}
+      />
+      <Select
+        options={options.map(x => [x.value, x.label])}
+        value={unit}
+        onChange={newValue => setUnit(newValue)}
+      />
+    </div>
   );
 }
diff --git a/packages/desktop-client/src/components/schedules/UpcomingLength.tsx b/packages/desktop-client/src/components/schedules/UpcomingLength.tsx
index b7d579623c0..cadcb8ecb1c 100644
--- a/packages/desktop-client/src/components/schedules/UpcomingLength.tsx
+++ b/packages/desktop-client/src/components/schedules/UpcomingLength.tsx
@@ -30,8 +30,11 @@ function useUpcomingLengthOptions() {
   return { upcomingLengthOptions };
 }
 
-function nonCustomUpcomingLengthValues() {
-  return ['1', '7', '14', 'oneMonth', 'currentMonth'];
+function nonCustomUpcomingLengthValues(value: string) {
+  return (
+    ['1', '7', '14', 'oneMonth', 'currentMonth'].findIndex(x => x === value) ===
+    -1
+  );
 }
 
 export function UpcomingLength() {
@@ -50,8 +53,7 @@ export function UpcomingLength() {
 
   const [tempUpcomingLength, setTempUpcomingLength] = useState(upcomingLength);
   const [useCustomLength, setUseCustomLength] = useState(
-    nonCustomUpcomingLengthValues().findIndex(x => x === tempUpcomingLength) ===
-      -1,
+    nonCustomUpcomingLengthValues(tempUpcomingLength),
   );
   const [saveActive, setSaveActive] = useState(false);
 
@@ -92,7 +94,11 @@ export function UpcomingLength() {
                 x.value || '7',
                 x.label,
               ])}
-              value={tempUpcomingLength}
+              value={
+                nonCustomUpcomingLengthValues(tempUpcomingLength)
+                  ? 'custom'
+                  : tempUpcomingLength
+              }
               onChange={newValue => {
                 setUseCustomLength(newValue === 'custom');
                 setTempUpcomingLength(newValue);

From c542092212fc63db28cecc363dca25ef5ecf6cfa Mon Sep 17 00:00:00 2001
From: SamBobBarnes <samuelrbarnes@outlook.com>
Date: Mon, 20 Jan 2025 11:11:49 -0600
Subject: [PATCH 05/11] updated getUpcomingDays to handle custom values

---
 packages/loot-core/src/shared/schedules.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/loot-core/src/shared/schedules.ts b/packages/loot-core/src/shared/schedules.ts
index 43e91e09d47..23d4e2bf215 100644
--- a/packages/loot-core/src/shared/schedules.ts
+++ b/packages/loot-core/src/shared/schedules.ts
@@ -369,6 +369,21 @@ export function getUpcomingDays(upcomingLength = '7'): number {
       );
     }
     default:
+      if (upcomingLength.includes('-')) {
+        const [num, unit] = upcomingLength.split('-');
+        switch (unit) {
+          case 'day':
+            return parseInt(num, 10);
+          case 'week':
+            return parseInt(num, 10) * 7;
+          case 'month':
+            return parseInt(num, 10) * 30;
+          case 'year':
+            return parseInt(num, 10) * 365;
+          default:
+            return 7;
+        }
+      }
       return parseInt(upcomingLength, 10);
   }
 }

From bcc43f9a2369137bb17b79b68b7a1aad45916d22 Mon Sep 17 00:00:00 2001
From: SamBobBarnes <samuelrbarnes@outlook.com>
Date: Mon, 20 Jan 2025 11:14:12 -0600
Subject: [PATCH 06/11] close modal after save

---
 .../src/components/schedules/UpcomingLength.tsx              | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/desktop-client/src/components/schedules/UpcomingLength.tsx b/packages/desktop-client/src/components/schedules/UpcomingLength.tsx
index cadcb8ecb1c..7ca665b6112 100644
--- a/packages/desktop-client/src/components/schedules/UpcomingLength.tsx
+++ b/packages/desktop-client/src/components/schedules/UpcomingLength.tsx
@@ -121,7 +121,10 @@ export function UpcomingLength() {
           >
             <Button
               isDisabled={!saveActive}
-              onPress={saveUpcomingLength}
+              onPress={() => {
+                saveUpcomingLength();
+                close();
+              }}
               type="submit"
               variant="primary"
             >

From 6cfd7a9968a63961d5287c38a514257bdbd5c9b2 Mon Sep 17 00:00:00 2001
From: SamBobBarnes <samuelrbarnes@outlook.com>
Date: Mon, 20 Jan 2025 11:26:38 -0600
Subject: [PATCH 07/11] test around getUpcomingDays

---
 .../loot-core/src/shared/schedules.test.ts    | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/packages/loot-core/src/shared/schedules.test.ts b/packages/loot-core/src/shared/schedules.test.ts
index 67f82e6ce81..de9a1c2c9cf 100644
--- a/packages/loot-core/src/shared/schedules.test.ts
+++ b/packages/loot-core/src/shared/schedules.test.ts
@@ -1,7 +1,11 @@
 import MockDate from 'mockdate';
 
 import * as monthUtils from './months';
-import { getRecurringDescription, getStatus } from './schedules';
+import {
+  getRecurringDescription,
+  getStatus,
+  getUpcomingDays,
+} from './schedules';
 
 describe('schedules', () => {
   const today = new Date(2017, 0, 1); // Global date when testing is set to 2017-01-01 per monthUtils.currentDay()
@@ -339,4 +343,20 @@ describe('schedules', () => {
       ).toBe('Every 2 months on the 17th, until 2021-06-01');
     });
   });
+
+  describe('getUpcomingDays', () => {
+    it.each([
+      ['1', 1],
+      ['7', 7],
+      ['14', 14],
+      ['oneMonth', 32],
+      ['currentMonth', 31],
+      ['2-day', 2],
+      ['5-week', 35],
+      ['3-month', 90],
+      ['4-year', 1460],
+    ])('value of %s returns %i days', (value: string, expected: number) => {
+      expect(getUpcomingDays(value)).toEqual(expected);
+    });
+  });
 });

From 442242742166269c652a85a9901090ad491444ca Mon Sep 17 00:00:00 2001
From: SamBobBarnes <samuelrbarnes@outlook.com>
Date: Tue, 21 Jan 2025 11:41:43 -0600
Subject: [PATCH 08/11] updated to use more accurate timespan calculation

---
 packages/loot-core/src/shared/schedules.test.ts |  2 +-
 packages/loot-core/src/shared/schedules.ts      | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/loot-core/src/shared/schedules.test.ts b/packages/loot-core/src/shared/schedules.test.ts
index de9a1c2c9cf..7f1fdd9caae 100644
--- a/packages/loot-core/src/shared/schedules.test.ts
+++ b/packages/loot-core/src/shared/schedules.test.ts
@@ -354,7 +354,7 @@ describe('schedules', () => {
       ['2-day', 2],
       ['5-week', 35],
       ['3-month', 90],
-      ['4-year', 1460],
+      ['4-year', 1461],
     ])('value of %s returns %i days', (value: string, expected: number) => {
       expect(getUpcomingDays(value)).toEqual(expected);
     });
diff --git a/packages/loot-core/src/shared/schedules.ts b/packages/loot-core/src/shared/schedules.ts
index 23d4e2bf215..e6752b9b126 100644
--- a/packages/loot-core/src/shared/schedules.ts
+++ b/packages/loot-core/src/shared/schedules.ts
@@ -352,6 +352,7 @@ export function describeSchedule(schedule, payee) {
 
 export function getUpcomingDays(upcomingLength = '7'): number {
   const today = monthUtils.currentDay();
+  const month = monthUtils.getMonth(today);
 
   switch (upcomingLength) {
     case 'currentMonth': {
@@ -360,7 +361,6 @@ export function getUpcomingDays(upcomingLength = '7'): number {
       return end - day + 1;
     }
     case 'oneMonth': {
-      const month = monthUtils.getMonth(today);
       return (
         monthUtils.differenceInCalendarDays(
           monthUtils.nextMonth(month),
@@ -371,15 +371,18 @@ export function getUpcomingDays(upcomingLength = '7'): number {
     default:
       if (upcomingLength.includes('-')) {
         const [num, unit] = upcomingLength.split('-');
+        const value = Math.max(1, parseInt(num, 10));
         switch (unit) {
           case 'day':
-            return parseInt(num, 10);
+            return value;
           case 'week':
-            return parseInt(num, 10) * 7;
+            return value * 7;
           case 'month':
-            return parseInt(num, 10) * 30;
+            const future = monthUtils.addMonths(today, value);
+            return monthUtils.differenceInCalendarDays(future, today);
           case 'year':
-            return parseInt(num, 10) * 365;
+            const futureYear = monthUtils.addYears(today, value);
+            return monthUtils.differenceInCalendarDays(futureYear, today);
           default:
             return 7;
         }

From b806eff13255f6fd919baf353966d3cbebfb51a1 Mon Sep 17 00:00:00 2001
From: SamBobBarnes <samuelrbarnes@outlook.com>
Date: Thu, 23 Jan 2025 13:08:09 -0600
Subject: [PATCH 09/11] fix for scheduled events only occurring till end of
 period

---
 packages/loot-core/src/shared/schedules.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/loot-core/src/shared/schedules.ts b/packages/loot-core/src/shared/schedules.ts
index e6752b9b126..1930c29270e 100644
--- a/packages/loot-core/src/shared/schedules.ts
+++ b/packages/loot-core/src/shared/schedules.ts
@@ -379,10 +379,10 @@ export function getUpcomingDays(upcomingLength = '7'): number {
             return value * 7;
           case 'month':
             const future = monthUtils.addMonths(today, value);
-            return monthUtils.differenceInCalendarDays(future, today);
+            return monthUtils.differenceInCalendarDays(future, month);
           case 'year':
             const futureYear = monthUtils.addYears(today, value);
-            return monthUtils.differenceInCalendarDays(futureYear, today);
+            return monthUtils.differenceInCalendarDays(futureYear, month);
           default:
             return 7;
         }

From 5a9712168a5d1ede52a0a4d797a2fe5e81d5a42e Mon Sep 17 00:00:00 2001
From: SamBobBarnes <samuelrbarnes@outlook.com>
Date: Thu, 23 Jan 2025 13:43:51 -0600
Subject: [PATCH 10/11] add a day

---
 packages/loot-core/src/shared/schedules.test.ts | 4 ++--
 packages/loot-core/src/shared/schedules.ts      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/loot-core/src/shared/schedules.test.ts b/packages/loot-core/src/shared/schedules.test.ts
index 7f1fdd9caae..69b55ae12ed 100644
--- a/packages/loot-core/src/shared/schedules.test.ts
+++ b/packages/loot-core/src/shared/schedules.test.ts
@@ -353,8 +353,8 @@ describe('schedules', () => {
       ['currentMonth', 31],
       ['2-day', 2],
       ['5-week', 35],
-      ['3-month', 90],
-      ['4-year', 1461],
+      ['3-month', 91],
+      ['4-year', 1462],
     ])('value of %s returns %i days', (value: string, expected: number) => {
       expect(getUpcomingDays(value)).toEqual(expected);
     });
diff --git a/packages/loot-core/src/shared/schedules.ts b/packages/loot-core/src/shared/schedules.ts
index 1930c29270e..584f66fe4f5 100644
--- a/packages/loot-core/src/shared/schedules.ts
+++ b/packages/loot-core/src/shared/schedules.ts
@@ -379,10 +379,10 @@ export function getUpcomingDays(upcomingLength = '7'): number {
             return value * 7;
           case 'month':
             const future = monthUtils.addMonths(today, value);
-            return monthUtils.differenceInCalendarDays(future, month);
+            return monthUtils.differenceInCalendarDays(future, month) + 1;
           case 'year':
             const futureYear = monthUtils.addYears(today, value);
-            return monthUtils.differenceInCalendarDays(futureYear, month);
+            return monthUtils.differenceInCalendarDays(futureYear, month) + 1;
           default:
             return 7;
         }

From 92862bfef69d6a2fccb4328c4c9858dfc6520342 Mon Sep 17 00:00:00 2001
From: SamBobBarnes <samuelrbarnes@outlook.com>
Date: Thu, 23 Jan 2025 13:47:41 -0600
Subject: [PATCH 11/11] fixed input step down

---
 .../src/components/schedules/CustomUpcomingLength.tsx         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/desktop-client/src/components/schedules/CustomUpcomingLength.tsx b/packages/desktop-client/src/components/schedules/CustomUpcomingLength.tsx
index 3b03d69ec70..d84b50c5290 100644
--- a/packages/desktop-client/src/components/schedules/CustomUpcomingLength.tsx
+++ b/packages/desktop-client/src/components/schedules/CustomUpcomingLength.tsx
@@ -44,9 +44,9 @@ export function CustomUpcomingLength({
         id="length"
         style={{ width: 40 }}
         type="number"
-        min={numValue}
+        min={1}
         onChange={e => setNumValue(parseInt(e.target.value))}
-        defaultValue={numValue}
+        defaultValue={numValue || 1}
       />
       <Select
         options={options.map(x => [x.value, x.label])}