diff --git a/src/lib/subscriptions/queries.ts b/src/lib/subscriptions/queries.ts index 1c32aa9..8d03776 100644 --- a/src/lib/subscriptions/queries.ts +++ b/src/lib/subscriptions/queries.ts @@ -28,10 +28,12 @@ export const runwayQueries = { bills: (start: string, end: string) => ({ queryFn: () => all("/v1/bills", { end, start }), queryKey: ["subscriptions", "runway", start, end], + refetchOnWindowFocus: true, }), paid: () => ({ queryFn: async () => toPayments(await search("has_any_bill:true")), queryKey: ["subscriptions", "payments"], + refetchOnWindowFocus: true, }), unlinked: (day: string) => { const after = addDays(day, -UNLINKED_DAYS); diff --git a/src/lib/subscriptions/runway.ts b/src/lib/subscriptions/runway.ts index f9417da..57cf4f6 100644 --- a/src/lib/subscriptions/runway.ts +++ b/src/lib/subscriptions/runway.ts @@ -208,11 +208,7 @@ function occurrences(bill: Bill, day: string) { return (bill.pay_dates ?? []) .map((raw) => raw.slice(0, 10)) .filter((date) => !end || date <= end) - .filter( - (date) => - date < day || - !paid.some((p) => p <= date && daysBetween(p, date) < early) - ) + .filter((date) => !paid.some((p) => Math.abs(daysBetween(p, date)) < early)) .map((date) => ({ date: date < day ? day : date, overdue: date < day })); }