diff --git a/src/components/medications/card-parts/medication-state-badges.tsx b/src/components/medications/card-parts/medication-state-badges.tsx index f2287ebda..a51fa96fc 100644 --- a/src/components/medications/card-parts/medication-state-badges.tsx +++ b/src/components/medications/card-parts/medication-state-badges.tsx @@ -92,10 +92,10 @@ export function MedicationStateBadges({ !autoMarkTaken && !recordOnly && !courseEnded && ( - - {t("medications.withoutNotification")} - - )} + + {t("medications.withoutNotification")} + + )} {!active && ( {pausedAt diff --git a/src/components/medications/intake-history-list-v2.tsx b/src/components/medications/intake-history-list-v2.tsx index 4839d2429..5f5efb97a 100644 --- a/src/components/medications/intake-history-list-v2.tsx +++ b/src/components/medications/intake-history-list-v2.tsx @@ -435,7 +435,8 @@ export function IntakeHistoryListV2({ {event.autoRecorded ? t("medications.intakeRecordedAutomatically") : t("medications.intakeSourceVia", { - origin: sourceLabels[event.source] ?? event.source, + origin: + sourceLabels[event.source] ?? event.source, })} @@ -541,7 +542,9 @@ export function IntakeHistoryListV2({ {event.autoRecorded ? t("medications.intakeRecordedAutomatically") : t("medications.intakeSourceVia", { - origin: sourceLabels[event.source] ?? event.source, + origin: + sourceLabels[event.source] ?? + event.source, })} diff --git a/src/lib/jobs/__tests__/intake-auto-take.test.ts b/src/lib/jobs/__tests__/intake-auto-take.test.ts index f099b90ae..6b61539ed 100644 --- a/src/lib/jobs/__tests__/intake-auto-take.test.ts +++ b/src/lib/jobs/__tests__/intake-auto-take.test.ts @@ -486,10 +486,7 @@ interface FakeRow { syncVersion: number; } -function fakeClient( - meds: ReturnType[], - rows: FakeRow[], -) { +function fakeClient(meds: ReturnType[], rows: FakeRow[]) { let seq = 0; const inRange = (d: Date | null, r?: { gte?: Date; lte?: Date }) => !!d && @@ -550,7 +547,10 @@ function fakeClient( ), create: vi.fn( async (args: { - data: Omit; + data: Omit< + FakeRow, + "id" | "deletedAt" | "syncVersion" | "autoMissed" + >; }) => { const row: FakeRow = { id: `new-${++seq}`, diff --git a/src/lib/jobs/intake-auto-take.ts b/src/lib/jobs/intake-auto-take.ts index 8817ba036..1f08876e9 100644 --- a/src/lib/jobs/intake-auto-take.ts +++ b/src/lib/jobs/intake-auto-take.ts @@ -201,8 +201,7 @@ export function isInPauseEra( const t = at.getTime(); return eras.some( (era) => - t >= era.pausedAt.getTime() && - t < (era.resumedAt ?? now).getTime(), + t >= era.pausedAt.getTime() && t < (era.resumedAt ?? now).getTime(), ); } diff --git a/src/lib/openapi/routes/medications/schemas.ts b/src/lib/openapi/routes/medications/schemas.ts index 5b1fe9fca..1e4147d6f 100644 --- a/src/lib/openapi/routes/medications/schemas.ts +++ b/src/lib/openapi/routes/medications/schemas.ts @@ -576,7 +576,7 @@ export const medicationIntakeEventResource = z autoRecorded: z .boolean() .describe( - "v1.42.2 — true when the server recorded this dose because the medication has `autoMarkTaken` on, not the person. It counts as taken everywhere (adherence, history, Coach) and consumed inventory like a manual take. Any take or skip the person records on the row clears it. Clients label such a dose \"recorded automatically\".", + 'v1.42.2 — true when the server recorded this dose because the medication has `autoMarkTaken` on, not the person. It counts as taken everywhere (adherence, history, Coach) and consumed inventory like a manual take. Any take or skip the person records on the row clears it. Clients label such a dose "recorded automatically".', ), attributionSource: z .enum(["AUTO", "USER_PIN"])