@tuturuuu/ui 0.10.0 → 0.11.1

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## [0.11.1](https://github.com/tutur3u/platform/compare/ui-v0.11.0...ui-v0.11.1) (2026-07-02)
+
+
+### Bug Fixes
+
+* **cli:** preserve markdown tables in task descriptions ([9faf8ba](https://github.com/tutur3u/platform/commit/9faf8ba44b92565a9dfc2949c496654fc1fea9b3))
+* **tasks:** refresh task template placeholders ([0c3c309](https://github.com/tutur3u/platform/commit/0c3c30935f67e3e64d548c8a13584fd597e887b8))
+* **ui:** stabilize task property popover handoff ([8fb2e62](https://github.com/tutur3u/platform/commit/8fb2e62904d34a3ae7894bfbbb66c285fcf1a1bd))
+
+## [0.11.0](https://github.com/tutur3u/platform/compare/ui-v0.10.0...ui-v0.11.0) (2026-06-29)
+
+
+### Features
+
+* **finance:** support prepaid subscription invoice ranges ([fa0f338](https://github.com/tutur3u/platform/commit/fa0f3388dfb3d3ea539a8d8bdc3f100f268542c6))
+* **tasks:** add board header loading skeleton ([73f1242](https://github.com/tutur3u/platform/commit/73f12421a9cd50c035a1c9940e152354b1974f26))
+* **tasks:** add task templates ([8d0700a](https://github.com/tutur3u/platform/commit/8d0700ad255c7b5874bfa065575df6b1cde34063))
+
+
+### Bug Fixes
+
+* **tasks:** pad board header skeleton ([b0c5c0f](https://github.com/tutur3u/platform/commit/b0c5c0fea8871cac2603da6239b980c752b1c9f6))
+* **tasks:** prevent description wipes during yjs hydration ([947f38c](https://github.com/tutur3u/platform/commit/947f38c6474d07b1fac1c44e166638bfc87260c0))
+* **tasks:** restore tracked task descriptions ([f892ae2](https://github.com/tutur3u/platform/commit/f892ae23dfec41c2d25649b97a628d8cdcd1fa5d))
+
 ## [0.10.0](https://github.com/tutur3u/platform/compare/ui-v0.9.0...ui-v0.10.0) (2026-06-26)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuturuuu/ui",
-  "version": "0.10.0",
+  "version": "0.11.1",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -24,42 +24,42 @@
     "@hookform/resolvers": "^5.4.0",
     "@json-render/core": "^0.19.0",
     "@json-render/react": "^0.19.0",
-    "@radix-ui/react-accordion": "^1.2.14",
-    "@radix-ui/react-alert-dialog": "^1.1.17",
-    "@radix-ui/react-aspect-ratio": "^1.1.10",
-    "@radix-ui/react-avatar": "^1.2.0",
-    "@radix-ui/react-checkbox": "^1.3.5",
-    "@radix-ui/react-collapsible": "^1.1.14",
-    "@radix-ui/react-context-menu": "^2.3.1",
-    "@radix-ui/react-dialog": "^1.1.17",
-    "@radix-ui/react-dropdown-menu": "^2.1.18",
-    "@radix-ui/react-hover-card": "^1.1.17",
-    "@radix-ui/react-label": "^2.1.10",
-    "@radix-ui/react-menubar": "^1.1.18",
-    "@radix-ui/react-navigation-menu": "^1.2.16",
-    "@radix-ui/react-popover": "^1.1.17",
-    "@radix-ui/react-progress": "^1.1.10",
-    "@radix-ui/react-radio-group": "^1.4.1",
-    "@radix-ui/react-scroll-area": "^1.2.12",
-    "@radix-ui/react-select": "^2.3.1",
-    "@radix-ui/react-separator": "^1.1.10",
-    "@radix-ui/react-slider": "^1.4.1",
+    "@radix-ui/react-accordion": "^1.2.15",
+    "@radix-ui/react-alert-dialog": "^1.1.18",
+    "@radix-ui/react-aspect-ratio": "^1.1.11",
+    "@radix-ui/react-avatar": "^1.2.1",
+    "@radix-ui/react-checkbox": "^1.3.6",
+    "@radix-ui/react-collapsible": "^1.1.15",
+    "@radix-ui/react-context-menu": "^2.3.2",
+    "@radix-ui/react-dialog": "^1.1.18",
+    "@radix-ui/react-dropdown-menu": "^2.1.19",
+    "@radix-ui/react-hover-card": "^1.1.18",
+    "@radix-ui/react-label": "^2.1.11",
+    "@radix-ui/react-menubar": "^1.1.19",
+    "@radix-ui/react-navigation-menu": "^1.2.17",
+    "@radix-ui/react-popover": "^1.1.18",
+    "@radix-ui/react-progress": "^1.1.11",
+    "@radix-ui/react-radio-group": "^1.4.2",
+    "@radix-ui/react-scroll-area": "^1.2.13",
+    "@radix-ui/react-select": "^2.3.2",
+    "@radix-ui/react-separator": "^1.1.11",
+    "@radix-ui/react-slider": "^1.4.2",
     "@radix-ui/react-slot": "^1.3.0",
-    "@radix-ui/react-switch": "^1.3.1",
-    "@radix-ui/react-tabs": "^1.1.15",
-    "@radix-ui/react-toast": "^1.2.17",
-    "@radix-ui/react-toggle": "^1.1.12",
-    "@radix-ui/react-toggle-group": "^1.1.13",
-    "@radix-ui/react-tooltip": "^1.2.10",
+    "@radix-ui/react-switch": "^1.3.2",
+    "@radix-ui/react-tabs": "^1.1.16",
+    "@radix-ui/react-toast": "^1.2.18",
+    "@radix-ui/react-toggle": "^1.1.13",
+    "@radix-ui/react-toggle-group": "^1.1.14",
+    "@radix-ui/react-tooltip": "^1.2.11",
     "@streamdown/cjk": "^1.0.3",
     "@streamdown/code": "^1.1.1",
     "@streamdown/math": "^1.0.2",
     "@streamdown/mermaid": "^1.0.2",
     "@tanstack/react-hotkeys": "^0.10.0",
     "@tanstack/react-pacer": "^0.22.1",
-    "@tanstack/react-query": "^5.101.1",
+    "@tanstack/react-query": "^5.101.2",
     "@tanstack/react-table": "^8.21.3",
-    "@tanstack/react-virtual": "^3.14.3",
+    "@tanstack/react-virtual": "^3.14.5",
     "@tiptap/core": "3.27.1",
     "@tiptap/extension-collaboration": "3.27.1",
     "@tiptap/extension-collaboration-caret": "3.27.1",
@@ -88,9 +88,9 @@
     "@tuturuuu/apis": "0.7.0",
     "@tuturuuu/hooks": "0.0.2",
     "@tuturuuu/icons": "0.0.6",
-    "@tuturuuu/internal-api": "0.11.0",
+    "@tuturuuu/internal-api": "0.13.0",
     "@tuturuuu/supabase": "0.4.0",
-    "@tuturuuu/utils": "0.10.0",
+    "@tuturuuu/utils": "0.12.0",
     "@types/debug": "^4.1.13",
     "browser-image-compression": "^2.0.2",
     "class-variance-authority": "^0.7.1",
@@ -102,18 +102,18 @@
     "debug": "^4.4.3",
     "embla-carousel-react": "^8.6.0",
     "eventemitter3": "^5.0.4",
-    "framer-motion": "^12.41.0",
+    "framer-motion": "^12.42.2",
     "gsap": "^3.15.0",
-    "html2canvas-pro": "^2.1.1",
+    "html2canvas-pro": "^2.2.1",
     "input-otp": "^1.4.2",
     "katex": "^0.17.0",
     "lodash": "4.18.1",
     "moment": "^2.30.1",
-    "motion": "^12.41.0",
-    "next": "^16.2.9",
-    "next-intl": "^4.13.0",
+    "motion": "^12.42.2",
+    "next": "^16.3.0-preview.5",
+    "next-intl": "^4.13.1",
     "next-themes": "^0.4.6",
-    "nuqs": "^2.8.9",
+    "nuqs": "^2.9.0",
     "prosemirror-state": "^1.4.4",
     "qrcode.react": "^4.2.0",
     "react": "^19.2.7",
@@ -126,9 +126,9 @@
     "react-papaparse": "^4.4.0",
     "react-pdf": "^10.4.1",
     "react-resizable": "^4.0.2",
-    "react-resizable-panels": "^4.11.0",
+    "react-resizable-panels": "^4.12.0",
     "react-syntax-highlighter": "^16.1.1",
-    "recharts": "3.9.0",
+    "recharts": "3.9.1",
     "sonner": "^2.0.7",
     "streamdown": "^2.5.0",
     "tailwind-scrollbar": "^4.0.2",
@@ -143,34 +143,34 @@
     "zod": "^4.4.3"
   },
   "devDependencies": {
-    "@tailwindcss/postcss": "^4.3.1",
+    "@tailwindcss/postcss": "^4.3.2",
     "@tailwindcss/typography": "^0.5.20",
-    "@tanstack/react-query": "^5.101.1",
+    "@tanstack/react-query": "^5.101.2",
     "@tanstack/react-table": "^8.21.3",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.2",
-    "@tuturuuu/types": "0.12.0",
+    "@tuturuuu/types": "0.13.1",
     "@tuturuuu/typescript-config": "0.1.1",
     "@types/html2canvas": "^1.0.0",
     "@types/lodash": "^4.17.24",
-    "@types/node": "^26.0.0",
+    "@types/node": "^26.0.1",
     "@types/react": "^19.2.17",
     "@types/react-dom": "^19.2.3",
     "@types/react-resizable": "^4.0.0",
     "@types/react-syntax-highlighter": "^15.5.13",
     "@types/uuid": "^11.0.0",
     "@vitejs/plugin-react": "^6.0.3",
-    "autoprefixer": "^10.5.0",
+    "autoprefixer": "^10.5.2",
     "jsdom": "^29.1.1",
-    "postcss": "^8.5.14",
+    "postcss": "^8.5.16",
     "postcss-load-config": "^6.0.1",
-    "tailwindcss": "^4.3.1",
+    "tailwindcss": "^4.3.2",
     "typescript": "7.0.1-rc",
     "uuid": "^14.0.1",
     "vitest": "^4.1.9"
   },
   "peerDependencies": {
-    "@tanstack/react-query": "^5.101.1",
+    "@tanstack/react-query": "^5.101.2",
     "@tanstack/react-table": "^8.21.3"
   },
   "exports": {

package/src/components/ui/finance/invoices/components/subscription-attendance-summary.tsx

@@ -54,6 +54,8 @@ interface SubscriptionAttendanceSummaryProps {
   };
   totalSessions: number;
   attendanceRate: number;
+  coverageRangeLabel: string;
+  prepaidMonthCount: number;
 }
 
 export function SubscriptionAttendanceSummary({
@@ -73,6 +75,8 @@ export function SubscriptionAttendanceSummary({
   attendanceStats,
   totalSessions,
   attendanceRate,
+  coverageRangeLabel,
+  prepaidMonthCount,
 }: SubscriptionAttendanceSummaryProps): React.ReactElement {
   const t = useTranslations();
 
@@ -82,6 +86,8 @@ export function SubscriptionAttendanceSummary({
     ? selectedMonth
     : (availableMonths[0]?.value ?? selectedMonth);
   const monthLabel = formatMonthLabel(resolvedSelectedMonth, locale);
+  const displayedRangeLabel =
+    prepaidMonthCount > 1 ? coverageRangeLabel : monthLabel;
 
   return (
     <Card>
@@ -98,17 +104,25 @@ export function SubscriptionAttendanceSummary({
           <CardDescription className="flex flex-col gap-1">
             {selectedGroupIds.length === 1
               ? t('ws-invoices.attendance_for_month', {
-                  month: monthLabel,
+                  month: displayedRangeLabel,
                 })
               : t('ws-invoices.combined_attendance_for_month', {
                   count: selectedGroupIds.length,
-                  month: monthLabel,
-                  default: `Combined attendance from ${selectedGroupIds.length} groups for ${monthLabel}`,
+                  month: displayedRangeLabel,
+                  default: `Combined attendance from ${selectedGroupIds.length} groups for ${displayedRangeLabel}`,
                 })}
             <span className="text-muted-foreground text-xs">
               {isSelectedMonthPaid
-                ? t('ws-invoices.all_groups_paid_for_month')
-                : t('ws-invoices.some_groups_unpaid_for_month')}
+                ? t(
+                    prepaidMonthCount > 1
+                      ? 'ws-invoices.all_groups_paid_for_range'
+                      : 'ws-invoices.all_groups_paid_for_month'
+                  )
+                : t(
+                    prepaidMonthCount > 1
+                      ? 'ws-invoices.some_groups_unpaid_for_range'
+                      : 'ws-invoices.some_groups_unpaid_for_month'
+                  )}
             </span>
           </CardDescription>
         </div>

package/src/components/ui/finance/invoices/components/subscription-prepaid-controls.test.tsx

@@ -0,0 +1,41 @@
+import { render, screen } from '@testing-library/react';
+import { describe, expect, it, vi } from 'vitest';
+import { SubscriptionPrepaidControls } from './subscription-prepaid-controls';
+
+vi.mock('next-intl', () => ({
+  useTranslations: () => (key: string, values?: Record<string, unknown>) => {
+    const messages: Record<string, string> = {
+      'ws-invoices.coverage_range': 'Coverage',
+      'ws-invoices.prepaid_month_count': 'Months to cover',
+      'ws-invoices.prepaid_month_count_many': '{count} months',
+      'ws-invoices.prepaid_month_count_one': '1 month',
+      'ws-invoices.prepaid_months': 'Prepaid months',
+      'ws-invoices.prepaid_months_description':
+        'Choose how many months this subscription invoice should cover.',
+      'ws-invoices.valid_until': 'Valid until',
+    };
+
+    return (messages[key] ?? key).replace(
+      '{count}',
+      String(values?.count ?? '')
+    );
+  },
+}));
+
+describe('SubscriptionPrepaidControls', () => {
+  it('renders the prepaid count selector and coverage summary', () => {
+    render(
+      <SubscriptionPrepaidControls
+        coverageRangeLabel="June 2026 - August 2026"
+        prepaidMonthCount={3}
+        validUntilLabel="September 2026"
+        onPrepaidMonthCountChange={vi.fn()}
+      />
+    );
+
+    expect(screen.getByText('Prepaid months')).toBeInTheDocument();
+    expect(screen.getByText('Months to cover')).toBeInTheDocument();
+    expect(screen.getByText('June 2026 - August 2026')).toBeInTheDocument();
+    expect(screen.getByText('September 2026')).toBeInTheDocument();
+  });
+});

package/src/components/ui/finance/invoices/components/subscription-prepaid-controls.tsx

@@ -0,0 +1,93 @@
+'use client';
+
+import {
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle,
+} from '@tuturuuu/ui/card';
+import { Label } from '@tuturuuu/ui/label';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@tuturuuu/ui/select';
+import { useTranslations } from 'next-intl';
+import type React from 'react';
+import { MAX_PREPAID_MONTH_COUNT } from '../utils';
+
+interface SubscriptionPrepaidControlsProps {
+  coverageRangeLabel: string;
+  onPrepaidMonthCountChange: (monthCount: number) => void;
+  prepaidMonthCount: number;
+  validUntilLabel: string;
+}
+
+const PREPAID_MONTH_OPTIONS = Array.from(
+  { length: MAX_PREPAID_MONTH_COUNT },
+  (_, index) => index + 1
+);
+
+export function SubscriptionPrepaidControls({
+  coverageRangeLabel,
+  onPrepaidMonthCountChange,
+  prepaidMonthCount,
+  validUntilLabel,
+}: SubscriptionPrepaidControlsProps): React.ReactElement {
+  const t = useTranslations();
+
+  return (
+    <Card>
+      <CardHeader>
+        <CardTitle>{t('ws-invoices.prepaid_months')}</CardTitle>
+        <CardDescription>
+          {t('ws-invoices.prepaid_months_description')}
+        </CardDescription>
+      </CardHeader>
+      <CardContent className="space-y-4">
+        <div className="space-y-2">
+          <Label htmlFor="prepaid-month-count">
+            {t('ws-invoices.prepaid_month_count')}
+          </Label>
+          <Select
+            value={String(prepaidMonthCount)}
+            onValueChange={(value) => onPrepaidMonthCountChange(Number(value))}
+          >
+            <SelectTrigger id="prepaid-month-count">
+              <SelectValue />
+            </SelectTrigger>
+            <SelectContent>
+              {PREPAID_MONTH_OPTIONS.map((monthCount) => (
+                <SelectItem key={monthCount} value={String(monthCount)}>
+                  {monthCount === 1
+                    ? t('ws-invoices.prepaid_month_count_one')
+                    : t('ws-invoices.prepaid_month_count_many', {
+                        count: monthCount,
+                      })}
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+        </div>
+
+        <div className="grid gap-3 rounded-lg border bg-muted/30 p-3 text-sm">
+          <div className="flex items-center justify-between gap-3">
+            <span className="text-muted-foreground">
+              {t('ws-invoices.coverage_range')}
+            </span>
+            <span className="text-right font-medium">{coverageRangeLabel}</span>
+          </div>
+          <div className="flex items-center justify-between gap-3">
+            <span className="text-muted-foreground">
+              {t('ws-invoices.valid_until')}
+            </span>
+            <span className="text-right font-medium">{validUntilLabel}</span>
+          </div>
+        </div>
+      </CardContent>
+    </Card>
+  );
+}

package/src/components/ui/finance/invoices/hooks/use-subscription-auto-selection.ts

@@ -16,14 +16,9 @@ import type {
 } from '../types';
 import type { UserGroup } from '../utils';
 import {
-  getEffectiveAttendanceDays,
+  getBillableQuantityMapForGroupsRange,
   getEffectiveDays,
-  getSessionsForMonth,
-  getSessionsUntilMonth,
-  getSubscriptionCoverageInvoiceForGroup,
   getTotalSessionsForGroups,
-  isSubscriptionMonthPaidForGroup,
-  parseLocalCalendarDate,
 } from '../utils';
 
 interface UseSubscriptionAutoSelectionProps {
@@ -42,6 +37,7 @@ interface UseSubscriptionAutoSelectionProps {
     created_at?: string | null;
   }[];
   onSelectedProductsChange: Dispatch<SetStateAction<SelectedProductItem[]>>;
+  prepaidMonthCount?: number;
 }
 
 export type UseSubscriptionAutoSelectionResult = undefined;
@@ -165,54 +161,59 @@ const computeGroupAttendanceDaysMap = (
   }[],
   selectedMonth: string,
   userAttendance: { status: string; date: string; group_id?: string }[],
-  useAttendanceBased: boolean
+  useAttendanceBased: boolean,
+  prepaidMonthCount = 1
 ) => {
-  const groupAttendanceDaysMap: Record<string, number> = {};
-
-  for (const groupId of selectedGroupIds) {
-    const group = userGroups.find(
-      (g) => g.workspace_user_groups?.id === groupId
-    );
-    if (!group) continue;
-
-    const latestInvoice = getSubscriptionCoverageInvoiceForGroup(
-      latestSubscriptionInvoices,
-      groupId
-    );
-    const validUntil = latestInvoice?.valid_until
-      ? parseLocalCalendarDate(latestInvoice.valid_until)
-      : null;
+  return getBillableQuantityMapForGroupsRange({
+    groupIds: selectedGroupIds,
+    latestInvoices: latestSubscriptionInvoices,
+    prepaidMonthCount,
+    selectedMonth,
+    useAttendanceBased,
+    userAttendance,
+    userGroups,
+  });
+};
 
-    const isGroupPaid = isSubscriptionMonthPaidForGroup(
-      groupId,
-      selectedMonth,
-      latestSubscriptionInvoices
-    );
+const sumQuantityMap = (quantityMap: Record<string, number>) =>
+  Object.values(quantityMap).reduce((total, value) => total + value, 0);
 
-    const sessionsArray = group.workspace_user_groups?.sessions || [];
-    const groupSessions = isGroupPaid
-      ? 0
-      : validUntil
-        ? getSessionsUntilMonth(sessionsArray, selectedMonth, validUntil)
-        : getSessionsForMonth(sessionsArray, selectedMonth);
-
-    if (useAttendanceBased) {
-      const groupAttendance = isGroupPaid
-        ? []
-        : userAttendance.filter((a) => {
-            if (a.group_id !== groupId) return false;
-            if (!validUntil) return true;
-            const attendanceDate = parseLocalCalendarDate(a.date);
-            return attendanceDate >= validUntil;
-          });
-      groupAttendanceDaysMap[groupId] =
-        getEffectiveAttendanceDays(groupAttendance);
-    } else {
-      groupAttendanceDaysMap[groupId] = groupSessions;
-    }
+const computeFallbackAttendanceDays = ({
+  groupAttendanceDaysMap,
+  latestSubscriptionInvoices,
+  prepaidMonthCount,
+  selectedGroupIds,
+  selectedMonth,
+  useAttendanceBased,
+  userAttendance,
+  userGroups,
+}: {
+  groupAttendanceDaysMap: Record<string, number>;
+  latestSubscriptionInvoices: {
+    group_id?: string;
+    valid_until?: string | null;
+    created_at?: string | null;
+  }[];
+  prepaidMonthCount: number;
+  selectedGroupIds: string[];
+  selectedMonth: string;
+  useAttendanceBased: boolean;
+  userAttendance: { status: string; date: string; group_id?: string }[];
+  userGroups: UserGroup[];
+}): number => {
+  const mappedQuantity = sumQuantityMap(groupAttendanceDaysMap);
+  if (mappedQuantity > 0 || prepaidMonthCount > 1) {
+    return mappedQuantity;
   }
 
-  return groupAttendanceDaysMap;
+  const totalSessions = getTotalSessionsForGroups(
+    userGroups,
+    selectedGroupIds,
+    selectedMonth,
+    latestSubscriptionInvoices
+  );
+
+  return getEffectiveDays(userAttendance, totalSessions, useAttendanceBased);
 };
 
 export function useSubscriptionAutoSelection({
@@ -227,6 +228,7 @@ export function useSubscriptionAutoSelection({
   userAttendance,
   latestSubscriptionInvoices,
   onSelectedProductsChange,
+  prepaidMonthCount = 1,
 }: UseSubscriptionAutoSelectionProps): UseSubscriptionAutoSelectionResult {
   const t = useTranslations();
   const previousGroupIdRef = useRef<string>('');
@@ -248,7 +250,8 @@ export function useSubscriptionAutoSelection({
         latestSubscriptionInvoices,
         selectedMonth,
         userAttendance,
-        useAttendanceBased
+        useAttendanceBased,
+        prepaidMonthCount
       ),
     [
       sortedSelectedGroupIds,
@@ -257,6 +260,7 @@ export function useSubscriptionAutoSelection({
       selectedMonth,
       userAttendance,
       useAttendanceBased,
+      prepaidMonthCount,
     ]
   );
 
@@ -307,18 +311,22 @@ export function useSubscriptionAutoSelection({
 
     fallbackToastShownRef.current = false;
 
-    const totalSessions = getTotalSessionsForGroups(
-      userGroups,
-      sortedSelectedGroupIds,
-      selectedMonth,
-      latestSubscriptionInvoices
-    );
-
     const shouldUsePrefill =
-      prefillAmount != null && !initialPrefillUsedRef.current;
+      prepaidMonthCount === 1 &&
+      prefillAmount != null &&
+      !initialPrefillUsedRef.current;
     const attendanceDays = shouldUsePrefill
       ? prefillAmount
-      : getEffectiveDays(userAttendance, totalSessions, useAttendanceBased);
+      : computeFallbackAttendanceDays({
+          groupAttendanceDaysMap,
+          latestSubscriptionInvoices,
+          prepaidMonthCount,
+          selectedGroupIds: sortedSelectedGroupIds,
+          selectedMonth,
+          useAttendanceBased,
+          userAttendance,
+          userGroups,
+        });
 
     updateSelectedProducts(
       attendanceDays,
@@ -340,6 +348,7 @@ export function useSubscriptionAutoSelection({
     latestSubscriptionInvoices,
     updateSelectedProducts,
     groupAttendanceDaysMap,
+    prepaidMonthCount,
   ]);
 
   // Auto-add group products based on attendance when group is selected
@@ -352,22 +361,24 @@ export function useSubscriptionAutoSelection({
       return;
     }
 
-    if (prefillAmount != null && !initialPrefillUsedRef.current) {
+    if (
+      prepaidMonthCount === 1 &&
+      prefillAmount != null &&
+      !initialPrefillUsedRef.current
+    ) {
       return;
     }
 
-    const totalSessions = getTotalSessionsForGroups(
-      userGroups,
-      sortedSelectedGroupIds,
+    const attendanceDays = computeFallbackAttendanceDays({
+      groupAttendanceDaysMap,
+      latestSubscriptionInvoices,
+      prepaidMonthCount,
+      selectedGroupIds: sortedSelectedGroupIds,
       selectedMonth,
-      latestSubscriptionInvoices
-    );
-
-    const attendanceDays = getEffectiveDays(
+      useAttendanceBased,
       userAttendance,
-      totalSessions,
-      useAttendanceBased
-    );
+      userGroups,
+    });
 
     if (attendanceDays === 0) return;
 
@@ -409,5 +420,6 @@ export function useSubscriptionAutoSelection({
     onSelectedProductsChange,
     products,
     groupAttendanceDaysMap,
+    prepaidMonthCount,
   ]);
 }