Skip to content

Commit 5ad4554

Browse files
committed
tweak task form
1 parent 122ee61 commit 5ad4554

File tree

1 file changed

+43
-39
lines changed

1 file changed

+43
-39
lines changed

apps/app/src/components/TaskForm.tsx

+43-39
Original file line numberDiff line numberDiff line change
@@ -354,46 +354,50 @@ export function TaskForm(props: Props) {
354354
}
355355
/>
356356

357-
{me?.stripeSubscriptionId && form.startTime && form.date && dayjs(form.date).isBefore(dayjs().add(1, "year")) && (
358-
<FormInput
359-
label="Reminder"
360-
error={props.error?.zodError?.fieldErrors?.reminder}
361-
input={
362-
<DropdownMenu.Root>
363-
<DropdownMenu.Trigger asChild>
364-
<TouchableOpacity className={merge(inputClassName, "flex flex-row items-center space-x-2")}>
365-
<Icon icon={AlarmClock} size={16} />
366-
<Text className="text-sm">
367-
{REMINDER_OPTIONS.find((r) => r.value === form.reminder)?.name || "None"}
368-
</Text>
369-
</TouchableOpacity>
370-
</DropdownMenu.Trigger>
371-
<DropdownMenu.Content>
372-
<DropdownMenu.Item key="none" onSelect={() => setForm({ ...form, reminder: null })}>
373-
None
374-
</DropdownMenu.Item>
375-
{REMINDER_OPTIONS.map((option) => (
376-
<DropdownMenu.Item
377-
key={option.value}
378-
disabled={dayjs(form.date!)
379-
.set("hour", Number(form.startTime!.split(":")[0]))
380-
.set("minute", Number(form.startTime!.split(":")[1]))
381-
.subtract(reminderHash[option.value].hours, "hours")
382-
.subtract(reminderHash[option.value].minutes, "minutes")
383-
.isBefore(dayjs())}
384-
onSelect={() => {
385-
setForm({ ...form, reminder: option.value })
386-
}}
387-
>
388-
{option.name}
357+
{me?.stripeSubscriptionId &&
358+
form.startTime &&
359+
form.date &&
360+
dayjs(form.date).isBefore(dayjs().add(1, "year")) &&
361+
dayjs(form.date).isAfter(dayjs().startOf("day")) && (
362+
<FormInput
363+
label="Reminder"
364+
error={props.error?.zodError?.fieldErrors?.reminder}
365+
input={
366+
<DropdownMenu.Root>
367+
<DropdownMenu.Trigger asChild>
368+
<TouchableOpacity className={merge(inputClassName, "flex flex-row items-center space-x-2")}>
369+
<Icon icon={AlarmClock} size={16} />
370+
<Text className="text-sm">
371+
{REMINDER_OPTIONS.find((r) => r.value === form.reminder)?.name || "None"}
372+
</Text>
373+
</TouchableOpacity>
374+
</DropdownMenu.Trigger>
375+
<DropdownMenu.Content>
376+
<DropdownMenu.Item key="none" onSelect={() => setForm({ ...form, reminder: null })}>
377+
None
389378
</DropdownMenu.Item>
390-
))}
391-
<DropdownMenu.Arrow />
392-
</DropdownMenu.Content>
393-
</DropdownMenu.Root>
394-
}
395-
/>
396-
)}
379+
{REMINDER_OPTIONS.map((option) => (
380+
<DropdownMenu.Item
381+
key={option.value}
382+
disabled={dayjs(form.date!)
383+
.set("hour", Number(form.startTime!.split(":")[0]))
384+
.set("minute", Number(form.startTime!.split(":")[1]))
385+
.subtract(reminderHash[option.value].hours, "hours")
386+
.subtract(reminderHash[option.value].minutes, "minutes")
387+
.isBefore(dayjs())}
388+
onSelect={() => {
389+
setForm({ ...form, reminder: option.value })
390+
}}
391+
>
392+
{option.name}
393+
</DropdownMenu.Item>
394+
))}
395+
<DropdownMenu.Arrow />
396+
</DropdownMenu.Content>
397+
</DropdownMenu.Root>
398+
}
399+
/>
400+
)}
397401
</View>
398402
<DateTimePickerModal
399403
mode="time"

0 commit comments

Comments
 (0)