@@ -342,7 +357,7 @@ export const AddOrEditExpensePage: React.FC<{
const SponsorUs = () => {
const { t } = useTranslation();
return (
-
+
diff --git a/src/components/ui/calendar.tsx b/src/components/ui/calendar.tsx
index 4b8959c1..ac1c817e 100644
--- a/src/components/ui/calendar.tsx
+++ b/src/components/ui/calendar.tsx
@@ -1,7 +1,7 @@
import { ChevronDownIcon, ChevronLeftIcon, ChevronRightIcon } from 'lucide-react';
+import { useTranslation } from 'next-i18next';
import * as React from 'react';
-import { type DayButton, DayPicker, getDefaultClassNames } from 'react-day-picker';
-
+import { type DayButton, DayPicker, getDefaultClassNames, Locale } from 'react-day-picker';
import { Button, buttonVariants } from '~/components/ui/button';
import { cn } from '~/lib/utils';
@@ -18,9 +18,26 @@ function Calendar({
buttonVariant?: React.ComponentProps
['variant'];
}) {
const defaultClassNames = getDefaultClassNames();
+ const { i18n } = useTranslation();
+ const [locale, setLocale] = React.useState(undefined);
+ React.useEffect(() => {
+ const userLocale = i18n.language;
+ (async () => {
+ try {
+ const [first, second] = i18n.language.split('-');
+ const key = `${first}${second?.toUpperCase() ?? ''}`;
+ // @ts-ignore
+ const { [key]: dayPickerLocale } = await import('react-day-picker/locale');
+ setLocale(dayPickerLocale);
+ } catch (e) {
+ setLocale(undefined);
+ }
+ })();
+ }, [i18n]);
return (
void;
+ value: string;
+ className?: string;
+}
+
+interface ParsedCron {
+ type: string;
+ values: {
+ minutes?: number[];
+ hours?: number[];
+ daysOfMonth?: number[];
+ months?: number[];
+ daysOfWeek?: number[];
+ custom?: string;
+ };
+}
+
+const SCHEDULE_TYPES = (t: TFunction) =>
+ [
+ { value: 'never', label: t('recurrence.schedule_type.never') },
+ { value: 'day', label: t('recurrence.schedule_type.day') },
+ { value: 'week', label: t('recurrence.schedule_type.week') },
+ { value: 'month', label: t('recurrence.schedule_type.month') },
+ { value: 'year', label: t('recurrence.schedule_type.year') },
+ { value: 'custom', label: t('recurrence.schedule_type.custom') },
+ ] as const;
+
+type ScheduleType = ReturnType[number];
+
+const DAYS_OF_MONTH = Array.from({ length: 31 }, (_, i) => i + 1);
+
+const MONTHS_SHORT = (code: string) =>
+ Array.from({ length: 12 }, (_, i) => {
+ const date = new Date(2000, i, 1); // Year 2000, month i, day 1
+ return new Intl.DateTimeFormat(code, { month: 'short' }).format(date);
+ });
+
+const DAYS_SHORT = (code: string) =>
+ Array.from({ length: 7 }, (_, i) => {
+ const date = new Date(2000, 0, 2 + i); // Jan 2, 2000 was a Sunday
+ return new Intl.DateTimeFormat(code, { weekday: 'short' }).format(date);
+ });
+
+// GridButton component for reusable grid buttons
+interface GridButtonProps {
+ value: number | string;
+ isSelected: boolean;
+ onClick: (value: number | string) => void;
+ children?: React.ReactNode;
+ minWidth?: string;
+ className?: string;
+ disabled?: boolean;
+}
+
+const GridButton = React.memo(
+ ({
+ value,
+ isSelected,
+ onClick,
+ children,
+ minWidth = '36px',
+ className = '',
+ disabled = false,
+ }) => {
+ return (
+
+ );
+ },
+);
+
+GridButton.displayName = 'GridButton';
+
+// ScheduleFields component to handle layout complexity
+interface ScheduleFieldsProps {
+ scheduleType: string;
+ renderDaysOfWeekList: () => React.ReactNode;
+ renderMonthsGrid: () => React.ReactNode;
+ renderDaysOfMonthGrid: () => React.ReactNode;
+ renderTimeInput: () => React.ReactNode;
+}
+
+const ScheduleFields = React.memo(
+ ({
+ scheduleType,
+ renderDaysOfWeekList,
+ renderMonthsGrid,
+ renderDaysOfMonthGrid,
+ renderTimeInput,
+ }) => {
+ const outputs = [renderTimeInput];
+
+ if (scheduleType === 'never') {
+ return null;
+ }
+
+ if (scheduleType === 'week') {
+ outputs.push(renderDaysOfWeekList);
+ } else if (scheduleType === 'year') {
+ outputs.push(renderMonthsGrid);
+ outputs.push(renderDaysOfMonthGrid);
+ } else if (scheduleType === 'month') {
+ outputs.push(renderDaysOfMonthGrid);
+ }
+
+ return outputs.map((RenderFunc, index) => (
+ {RenderFunc()}
+ ));
+ },
+);
+
+ScheduleFields.displayName = 'ScheduleFields';
+
+export function CronBuilder({ onChange, value, className }: CronBuilderProps) {
+ const { t, i18n } = useTranslation();
+
+ const defaultSchedule = value; // Use provided default or fallback
+
+ // Helper function to parse cron expression and determine schedule type
+ const parseCronExpression = (cronExpr: string): ParsedCron => {
+ if (!cronExpr || cronExpr === '') return { type: 'never', values: {} };
+
+ // Clean and validate the cron expression
+ const cleanExpr = cronExpr.trim();
+ const parts = cleanExpr.split(' ');
+ if (parts.length !== 5) return { type: 'custom', values: { custom: cleanExpr } };
+
+ const [min, hour, dom, month, dow] = parts;
+
+ // Helper to safely parse numeric values from cron parts
+ const parseNumbers = (part?: string): number[] => {
+ if (part === '*' || !part) return [];
+ return part
+ .split(',')
+ .map((v) => parseInt(v.trim(), 10))
+ .filter((v) => !isNaN(v));
+ };
+
+ try {
+ // Check for standard patterns
+ if (min !== '*' && hour === '*' && dom === '*' && month === '*' && dow === '*') {
+ return { type: 'hour', values: { minutes: parseNumbers(min) } };
+ } else if (min !== '*' && hour !== '*' && dom === '*' && month === '*' && dow === '*') {
+ return {
+ type: 'day',
+ values: {
+ minutes: parseNumbers(min),
+ hours: parseNumbers(hour),
+ },
+ };
+ } else if (min !== '*' && hour !== '*' && dom === '*' && month === '*' && dow !== '*') {
+ return {
+ type: 'week',
+ values: {
+ minutes: parseNumbers(min),
+ hours: parseNumbers(hour),
+ daysOfWeek: parseNumbers(dow),
+ },
+ };
+ } else if (min !== '*' && hour !== '*' && dom !== '*' && month === '*' && dow === '*') {
+ return {
+ type: 'month',
+ values: {
+ minutes: parseNumbers(min),
+ hours: parseNumbers(hour),
+ daysOfMonth: parseNumbers(dom),
+ },
+ };
+ } else {
+ return { type: 'custom', values: { custom: cleanExpr } };
+ }
+ } catch (error) {
+ console.warn('Error parsing cron expression:', error);
+ return { type: 'custom', values: { custom: cleanExpr } };
+ }
+ };
+
+ const initialParsed = parseCronExpression(defaultSchedule);
+
+ const [scheduleType, setScheduleType] = useState(initialParsed.type);
+ const [minutes, setMinutes] = useState(initialParsed.values.minutes || [0]);
+ const [hours, setHours] = useState(initialParsed.values.hours || [0]);
+ const [daysOfMonth, setDaysOfMonth] = useState>(
+ initialParsed.values.daysOfMonth || [1],
+ );
+ const [months, setMonths] = useState(initialParsed.values.months || [1]);
+ const [daysOfWeek, setDaysOfWeek] = useState>(
+ initialParsed.values.daysOfWeek || [0],
+ );
+ const [custom, setCustom] = useState(initialParsed.values.custom || defaultSchedule);
+ const [cronExpression, setCronExpression] = useState(defaultSchedule);
+
+ const { cronParser } = useIntlCronParser();
+
+ function loadDefaults() {
+ setMinutes([0]);
+ setHours([0]);
+ setDaysOfMonth([1]);
+ setMonths([1]);
+ setDaysOfWeek([0]);
+ }
+
+ useEffect(() => {
+ let expression = '';
+
+ // Filter out undefined/null values and ensure valid arrays
+ const cleanMonths = (months || []).filter((v) => v !== undefined && v !== null);
+ const cleanDaysOfMonth = (daysOfMonth || []).filter((v) => v !== undefined && v !== null);
+ const cleanDaysOfWeek = (daysOfWeek || []).filter((v) => v !== undefined && v !== null);
+ const cleanHours = (hours || []).filter((v) => v !== undefined && v !== null);
+ const cleanMinutes = (minutes || []).filter((v) => v !== undefined && v !== null);
+
+ const monthsCSV = cleanMonths.length === 12 ? '*' : cleanMonths.join(',');
+ const domCSV = cleanDaysOfMonth.length === 31 ? '*' : cleanDaysOfMonth.join(',');
+ const dowCSV = cleanDaysOfWeek.length === 7 ? '*' : cleanDaysOfWeek.join(',');
+ const hoursCSV = cleanHours.length === 24 ? '*' : cleanHours.join(',');
+ const minutesCSV = cleanMinutes.length === 60 ? '*' : cleanMinutes.join(',');
+
+ switch (scheduleType) {
+ case 'day':
+ expression = `${minutesCSV} ${hoursCSV} * * *`;
+ break;
+ case 'week':
+ expression = `${minutesCSV} ${hoursCSV} * * ${dowCSV}`;
+ break;
+ case 'month':
+ expression = `${minutesCSV} ${hoursCSV} ${domCSV} * *`;
+ break;
+ case 'year':
+ expression = `${minutesCSV} ${hoursCSV} ${domCSV} ${monthsCSV} *`;
+ break;
+ case 'custom':
+ expression = custom || '';
+ break;
+ default:
+ expression = '';
+ }
+
+ if (getCronText(cronParser, expression).status) {
+ setCronExpression(expression);
+ onChange(expression);
+ } else {
+ setCronExpression('');
+ onChange('');
+ }
+ }, [scheduleType, minutes, hours, daysOfMonth, months, daysOfWeek, custom]);
+
+ const handleMonthToggle = useCallback((monthIndex: number | string) => {
+ const monthNum = (typeof monthIndex === 'number' ? monthIndex : parseInt(monthIndex, 10)) + 1;
+ setMonths([monthNum]);
+ }, []);
+
+ // Month button component with pressed state
+ interface MonthButtonProps {
+ month: string;
+ index: number;
+ isSelected: boolean;
+ onClick: (index: number) => void;
+ }
+
+ const MonthButton = React.memo(({ month, index, isSelected, onClick }) => {
+ return (
+
+ );
+ });
+
+ MonthButton.displayName = 'MonthButton';
+
+ const renderMonthsGrid = () => (
+
+
+
+ {MONTHS_SHORT(i18n.language).map((month, index) => (
+
+ ))}
+
+
+
+
+ {DAYS_SHORT(i18n.language).map((day, index) => {
+ const isWeekend = weekendDays.includes(index);
+ const isSelected = daysOfWeek.includes(index);
+ return (
+
+ );
+ })}
+
+
+
+
+ {DAYS_OF_MONTH.map((day) => (
+
+ ))}
+
+
+
+
+ {
+ const date = e.target.valueAsDate;
+ setValue(e.target.value);
+ if (date) {
+ setHours([date.getUTCHours()]);
+ setMinutes([date.getUTCMinutes()]);
+ }
+ }}
+ className="bg-background appearance-none [&::-webkit-calendar-picker-indicator]:hidden [&::-webkit-calendar-picker-indicator]:appearance-none"
+ />
+
+ );
+ };
+
+ // Render Cron expression builder UI
+ return (
+
+
+
+ {
+ if (value) {
+ loadDefaults();
+ setScheduleType(value);
+ }
+ }}
+ className="w-fit flex-wrap justify-start"
+ >
+ {SCHEDULE_TYPES(t).map(({ value, label }) => (
+
+ {label}
+
+ ))}
+
+
+
+ {scheduleType === 'never' ? (
+
{t('recurrence.never')}
+ ) : (
+
+ {scheduleType === 'custom' ? (
+
+
+ {
+ setCustom(event.target.value);
+ }}
+ className="border-input bg-background text-foreground placeholder:text-muted-foreground focus-visible:ring-ring flex h-9 w-[50%] rounded-md border px-3 py-1 text-sm shadow-sm transition-colors focus-visible:ring-1 focus-visible:outline-none"
+ placeholder="0 0 * * 0"
+ />
+
+ ) : (
+
+ )}
+
+
+ {(() => {
+ const cronString = getCronText(cronParser, cronExpression);
+ if (cronString.status)
+ return (
+
+ {cronString.value}{' '}
+
+ cron({cronExpression})
+
+
+ );
+ else
+ return (
+
+ {t('errors.invalid_cron_expression')}
+
+ );
+ })()}
+
+
+ )}
+
+
{!expensesQuery.data?.length ? (
{t('ui.no_activity')}
@@ -86,18 +104,16 @@ const ActivityPage: NextPageWithUser = ({ user }) => {
)}
-
- {getPaymentString(
- user,
- e.expense.amount,
- e.expense.paidBy,
- e.amount,
- e.expense.splitType === SplitType.SETTLEMENT,
- e.expense.currency,
- t,
- !!e.expense.deletedBy,
- )}
-
+ {getPaymentString(
+ user,
+ e.expense.amount,
+ e.expense.paidBy,
+ e.amount,
+ e.expense.splitType === SplitType.SETTLEMENT,
+ e.expense.currency,
+ t,
+ !!e.expense.deletedBy,
+ )}
{toUIDate(e.expense.expenseDate)}
{t('navigation.recurring')}
+
+ }
+ loading={recurringExpensesQuery.isPending}
+ >
+
+ {!recurringExpensesQuery.data?.length ? (
+
{t('recurrence.empty')}
+ ) : null}
+ {recurringExpensesQuery.data?.map((e) => (
+
+
+
+
+
+
+ {t('recurrence.expense_for_the_amount_of', {
+ name: e.expense.name,
+ amount: toUIString(e.expense.amount),
+ currency: e.expense.currency,
+ })}
+
+
+ {t('recurrence.recurring')}
+ {i18nReady
+ ? `:
+
+ ${cronParser(cronFromBackend(e.job.schedule))}`
+ : ''}
+
+
{toUIDate(e.expense.expenseDate)}
+
+
+ ))}
+
+
+
+ );
+};
+
+RecurringPage.auth = true;
+
+export const getStaticProps = withI18nStaticProps(['common']);
+
+export default RecurringPage;
diff --git a/src/server/api/routers/expense.ts b/src/server/api/routers/expense.ts
index d6f26374..d11b1ad4 100644
--- a/src/server/api/routers/expense.ts
+++ b/src/server/api/routers/expense.ts
@@ -19,6 +19,7 @@ import { currencyRateProvider } from '../services/currencyRateService';
import { isCurrencyCode } from '~/lib/currency';
import { SplitType } from '@prisma/client';
import { DEFAULT_CATEGORY } from '~/lib/category';
+import { createRecurringExpenseJob } from '../services/scheduleService';
export const expenseRouter = createTRPCRouter({
getBalances: protectedProcedure.query(async ({ ctx }) => {
@@ -106,6 +107,31 @@ export const expenseRouter = createTRPCRouter({
? await editExpense(input, ctx.session.user.id)
: await createExpense(input, ctx.session.user.id);
+ if (expense && input.cronExpression) {
+ const [{ schedule }] = await createRecurringExpenseJob(expense.id, input.cronExpression);
+ console.log('Created recurring expense job with jobid:', schedule);
+
+ await db.expense.update({
+ where: { id: expense.id },
+ data: {
+ recurrence: {
+ upsert: {
+ create: {
+ job: {
+ connect: { jobid: schedule },
+ },
+ },
+ update: {
+ job: {
+ connect: { jobid: schedule },
+ },
+ },
+ },
+ },
+ },
+ });
+ }
+
return expense;
} catch (error) {
console.error(error);
@@ -313,6 +339,15 @@ export const expenseRouter = createTRPCRouter({
deletedByUser: true,
updatedByUser: true,
group: true,
+ recurrence: {
+ include: {
+ job: {
+ select: {
+ schedule: true,
+ },
+ },
+ },
+ },
conversionTo: {
include: {
expenseParticipants: {
@@ -353,6 +388,10 @@ export const expenseRouter = createTRPCRouter({
});
}
+ if (expense?.recurrence?.job.schedule) {
+ expense.recurrence.job.schedule = expense.recurrence.job.schedule.replaceAll('$', 'L');
+ }
+
return expense;
}),
@@ -393,6 +432,41 @@ export const expenseRouter = createTRPCRouter({
return expenses;
}),
+ getRecurringExpenses: protectedProcedure.query(async ({ ctx }) => {
+ const recurrences = await db.expenseRecurrence.findMany({
+ include: {
+ job: true,
+ expense: {
+ take: 1,
+ orderBy: { createdAt: 'desc' },
+ where: {
+ deletedBy: null,
+ expenseParticipants: {
+ some: {
+ userId: ctx.session.user.id,
+ },
+ },
+ recurrenceId: { not: null },
+ },
+ include: {
+ addedByUser: {
+ select: {
+ name: true,
+ email: true,
+ image: true,
+ id: true,
+ },
+ },
+ },
+ },
+ },
+ });
+
+ return recurrences
+ .filter((r) => r.expense.length > 0)
+ .map((r) => ({ ...r, expense: r.expense[0]! }));
+ }),
+
getUploadUrl: protectedProcedure
.input(z.object({ fileName: z.string(), fileType: z.string(), fileSize: z.number() }))
.mutation(async ({ input, ctx }) => {
diff --git a/src/server/api/services/notificationService.ts b/src/server/api/services/notificationService.ts
index c0c9bccf..d270d039 100644
--- a/src/server/api/services/notificationService.ts
+++ b/src/server/api/services/notificationService.ts
@@ -99,3 +99,42 @@ export async function sendExpensePushNotification(expenseId: string) {
await Promise.all(pushNotifications);
}
+
+export async function checkRecurrenceNotifications() {
+ try {
+ const recurrences = await db.expenseRecurrence.findMany({
+ where: {
+ NOT: {
+ notified: true,
+ },
+ },
+ include: {
+ expense: {
+ select: { id: true },
+ orderBy: { createdAt: 'desc' },
+ take: 1,
+ },
+ },
+ });
+
+ await Promise.all(
+ recurrences
+ .filter((r) => r.expense[0])
+ .map(async (r) => {
+ await sendExpensePushNotification(r.expense[0]!.id);
+ await db.expenseRecurrence.update({
+ where: {
+ id: r.id,
+ },
+ data: {
+ notified: true,
+ },
+ });
+ }),
+ );
+ } catch (e) {
+ console.error('Error sending recurrence notifications', e);
+ } finally {
+ setTimeout(checkRecurrenceNotifications, 1000 * 60); // Check every minute
+ }
+}
diff --git a/src/server/api/services/scheduleService.ts b/src/server/api/services/scheduleService.ts
index e17c01b8..c91a8111 100644
--- a/src/server/api/services/scheduleService.ts
+++ b/src/server/api/services/scheduleService.ts
@@ -20,3 +20,10 @@ export const createRecurringDeleteBankCacheJob = async (frequency: 'weekly' | 'm
`;
}
};
+
+export const createRecurringExpenseJob = (expenseId: string, cronExpression: string) =>
+ db.$queryRawUnsafe<[{ schedule: bigint }]>(
+ `SELECT cron.schedule($1, $2, $$ SELECT duplicate_expense_with_participants('${expenseId}'::UUID); $$);`,
+ expenseId,
+ cronExpression,
+ );
diff --git a/src/server/api/services/splitService.ts b/src/server/api/services/splitService.ts
index 1cb8a81e..3268c3ba 100644
--- a/src/server/api/services/splitService.ts
+++ b/src/server/api/services/splitService.ts
@@ -208,6 +208,11 @@ export async function deleteExpense(expenseId: string, deletedBy: number) {
},
include: {
expenseParticipants: true,
+ recurrence: {
+ include: {
+ job: true,
+ },
+ },
},
});
@@ -335,6 +340,27 @@ export async function deleteExpense(expenseId: string, deletedBy: number) {
}),
);
+ if (expense.recurrence?.job) {
+ // Only delete the cron job if there's no other linked expense
+ const linkedExpenses = await db.expense.count({
+ where: {
+ recurrenceId: expense.recurrenceId,
+ id: {
+ not: expense.id,
+ },
+ },
+ });
+
+ if (linkedExpenses === 0) {
+ operations.push(db.$executeRaw`SELECT cron.unschedule(${expense.recurrence.job.jobname})`);
+ operations.push(
+ db.expenseRecurrence.delete({
+ where: { id: expense.recurrence.id },
+ }),
+ );
+ }
+ }
+
await db.$transaction(operations);
sendExpensePushNotification(expenseId).catch(console.error);
}
@@ -365,6 +391,11 @@ export async function editExpense(
where: { id: expenseId },
include: {
expenseParticipants: true,
+ recurrence: {
+ include: {
+ job: true,
+ },
+ },
},
});
@@ -589,6 +620,9 @@ export async function editExpense(
}
});
+ if (expense.recurrence?.job) {
+ operations.push(db.$executeRaw`SELECT cron.unschedule(${expense.recurrence.job.jobname})`);
+ }
await db.$transaction(operations);
await updateGroupExpenseForIfBalanceIsZero(
paidBy,
diff --git a/src/store/addStore.ts b/src/store/addStore.ts
index bbf01986..96755dd5 100644
--- a/src/store/addStore.ts
+++ b/src/store/addStore.ts
@@ -15,22 +15,23 @@ export interface AddExpenseState {
amount: bigint;
amountStr: string;
isNegative: boolean;
- currentUser: User | undefined;
+ currentUser?: User;
splitType: SplitType;
- group: Group | undefined;
+ group?: Group;
participants: Participant[];
splitShares: SplitShares;
description: string;
currency: CurrencyCode;
category: string;
nameOrEmail: string;
- paidBy: User | undefined;
+ paidBy?: User;
showFriends: boolean;
isFileUploading: boolean;
fileKey?: string;
canSplitScreenClosed: boolean;
splitScreenOpen: boolean;
- expenseDate: Date | undefined;
+ expenseDate: Date;
+ cronExpression: string;
transactionId?: string;
multipleTransactions: TransactionAddInputModel[];
isTransactionLoading: boolean;
@@ -58,6 +59,7 @@ export interface AddExpenseState {
setTransactionId: (transactionId?: string) => void;
setMultipleTransactions: (multipleTransactions: TransactionAddInputModel[]) => void;
setIsTransactionLoading: (isTransactionLoading: boolean) => void;
+ setCronExpression: (cronExpression: string) => void;
};
}
@@ -67,7 +69,6 @@ export const useAddExpenseStore = create
()((set) => ({
isNegative: false,
splitType: SplitType.EQUAL,
participants: [],
- group: undefined,
splitShares: {
[SplitType.EQUAL]: {},
[SplitType.PERCENTAGE]: {},
@@ -79,17 +80,16 @@ export const useAddExpenseStore = create()((set) => ({
currency: 'USD',
category: DEFAULT_CATEGORY,
nameOrEmail: '',
- paidBy: undefined,
- currentUser: undefined,
description: '',
showFriends: true,
isFileUploading: false,
- fileKey: undefined,
canSplitScreenClosed: true,
splitScreenOpen: false,
- expenseDate: undefined,
+ expenseDate: new Date(),
+ repeatEvery: 1,
multipleTransactions: [],
isTransactionLoading: false,
+ cronExpression: '',
actions: {
setAmount: (realAmount) =>
set((s) => {
@@ -278,6 +278,16 @@ export const useAddExpenseStore = create()((set) => ({
group: undefined,
amountStr: '',
splitShares: s.currentUser ? { [s.currentUser.id]: initSplitShares() } : {},
+ isNegative: false,
+ canSplitScreenClosed: true,
+ splitScreenOpen: false,
+ expenseDate: new Date(),
+ transactionId: undefined,
+ multipleTransactions: [],
+ isTransactionLoading: false,
+ cronExpression: '',
+ isFileUploading: false,
+ paidBy: s.currentUser,
}));
},
setSplitScreenOpen: (splitScreenOpen) => set({ splitScreenOpen }),
@@ -285,6 +295,7 @@ export const useAddExpenseStore = create()((set) => ({
setTransactionId: (transactionId) => set({ transactionId }),
setMultipleTransactions: (multipleTransactions) => set({ multipleTransactions }),
setIsTransactionLoading: (isTransactionLoading) => set({ isTransactionLoading }),
+ setCronExpression: (cronExpression) => set({ cronExpression }),
},
}));
diff --git a/src/types/expense.types.ts b/src/types/expense.types.ts
index d80118c1..c9f7bcb5 100644
--- a/src/types/expense.types.ts
+++ b/src/types/expense.types.ts
@@ -14,6 +14,7 @@ export type CreateExpense = Omit<
| 'fileKey'
| 'transactionId'
| 'otherConversion'
+ | 'recurrenceId'
> & {
expenseDate?: Date;
fileKey?: string;
@@ -45,6 +46,7 @@ export const createExpenseSchema = z.object({
expenseDate: z.date().optional(),
expenseId: z.string().optional(),
otherConversion: z.string().optional(),
+ cronExpression: z.string().optional(),
}) satisfies z.ZodType;
export const createCurrencyConversionSchema = z.object({
diff --git a/src/utils/i18n/server.ts b/src/utils/i18n/server.ts
index 12a4f2fa..d34b7b74 100644
--- a/src/utils/i18n/server.ts
+++ b/src/utils/i18n/server.ts
@@ -1,6 +1,6 @@
import { type SSRConfig } from 'next-i18next';
import { serverSideTranslations } from 'next-i18next/serverSideTranslations';
-import i18nConfig from 'next-i18next.config.js';
+import i18nConfig from '@/next-i18next.config.js';
export const customServerSideTranslations = async (
locale: string | undefined,
diff --git a/tsconfig.json b/tsconfig.json
index 2409a5a1..d7cb57b6 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -26,7 +26,7 @@
/* Path Aliases */
"paths": {
"~/*": ["./src/*"],
- "*": ["./*"]
+ "@/*": ["./*"]
}
},
"include": [