Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

mobile: fix reminder allows past time in edit mode without validation error

Ammar Ahmed419dd555f457
diff --git a/apps/mobile/app/screens/add-reminder/index.tsx b/apps/mobile/app/screens/add-reminder/index.tsx
index a1253ed05..ccda061bc 100644
--- a/apps/mobile/app/screens/add-reminder/index.tsx
+++ b/apps/mobile/app/screens/add-reminder/index.tsx
@@ -181,11 +181,7 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {
async function saveReminder() {
try {
if (!formRef.current.validate()) return;
- if (
- date.getTime() < Date.now() &&
- reminderMode === "once" &&
- !props.route.params.reminder
- ) {
+ if (date.getTime() < Date.now() && reminderMode === "once") {
throw new Error(strings.dateError());
}
@@ -197,9 +193,10 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {
)
throw new Error(strings.selectDayError());
+ if (!date && reminderMode !== ReminderModes.Permanent) return;
+
if (!(await Notifications.checkAndRequestPermissions(true)))
throw new Error(strings.noNotificationPermission());
- if (!date && reminderMode !== ReminderModes.Permanent) return;
date.setSeconds(0, 0);
@@ -491,16 +488,23 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) {
<DateTimePickerModal
isVisible={isDatePickerVisible}
mode="datetime"
+ minimumDate={
+ reminderMode === "once" ? dayjs().toDate() : new Date(0)
+ }
onConfirm={handleConfirm}
onCancel={hideDatePicker}
isDarkModeEnabled={isDark}
firstDayOfWeek={weekFormat === "Mon" ? 1 : 0}
is24Hour={db.settings.getTimeFormat() === "24-hour"}
date={date || new Date(Date.now())}
+ themeVariant={isDark ? "dark" : "light"}
/>
<DatePicker
date={date}
+ minimumDate={
+ reminderMode === "once" ? dayjs().toDate() : new Date(0)
+ }
maximumDate={dayjs(date).add(3, "months").toDate()}
onDateChange={handleConfirm}
theme={isDark ? "dark" : "light"}