From ab9d078bf0aa2231c79550c9230b74fa973d8070 Mon Sep 17 00:00:00 2001
From: hamed <15238-genius.ha@users.noreply.drupalcode.org>
Date: Sun, 14 Jun 2026 23:12:22 +0330
Subject: [PATCH] =?UTF-8?q?fix:=20fix=20SubscriptionPage=20crash=20?=
 =?UTF-8?q?=E2=80=94=20align=20with=20API=20response=20structure?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

API returns { subscription: {...}|null, used_trial: bool } not flat MySubscription.
- Added MySubscriptionData interface with correct nested shape
- Extract my = myRaw.subscription and usedTrial = myRaw.used_trial separately
- Replace my.used_trial references with usedTrial variable

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 assets/admin/pages/SubscriptionPage.tsx | 14 ++++++++------
 assets/admin/types/index.ts             | 12 ++++++++++++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/assets/admin/pages/SubscriptionPage.tsx b/assets/admin/pages/SubscriptionPage.tsx
index c91f5d6d..f52440ae 100644
--- a/assets/admin/pages/SubscriptionPage.tsx
+++ b/assets/admin/pages/SubscriptionPage.tsx
@@ -4,7 +4,7 @@ import { CheckIcon, SparklesIcon } from '@heroicons/react/24/outline';
 import { toast } from 'sonner';
 import { api } from '../lib/api';
 import type { ApiResponse } from '../lib/api';
-import type { SubscriptionPlan, MySubscription, SubscriptionPeriod } from '../types';
+import type { SubscriptionPlan, MySubscriptionData, SubscriptionPeriod } from '../types';
 import { formatDate, formatRial, formatNumber } from '../lib/utils';
 import Modal from '../components/ui/Modal';
 import PageHeader from '../components/ui/PageHeader';
@@ -33,13 +33,15 @@ export default function SubscriptionPage() {
     queryFn: () => api.get('/api/v1/subscription/plans'),
   });
 
-  const { data: myData } = useQuery<ApiResponse<MySubscription>>({
+  const { data: myData } = useQuery<ApiResponse<MySubscriptionData>>({
     queryKey: ['subscription-my'],
     queryFn: () => api.get('/api/v1/subscription/my'),
   });
 
-  const plans = plansData?.data ?? [];
-  const my    = myData?.data;
+  const plans      = plansData?.data ?? [];
+  const myRaw      = myData?.data;
+  const my         = myRaw?.subscription ?? null;
+  const usedTrial  = myRaw?.used_trial ?? false;
 
   const trialMutation = useMutation({
     mutationFn: () => api.post('/api/v1/subscription/trial', {}),
@@ -89,7 +91,7 @@ export default function SubscriptionPage() {
                 : <div style={{ fontSize: 13, color: 'var(--text-3)' }}>بدون تاریخ انقضا</div>
               }
             </div>
-            {!my.used_trial && (
+            {!usedTrial && (
               <button
                 className="btn primary sm"
                 style={{ marginRight: 'auto' }}
@@ -118,7 +120,7 @@ export default function SubscriptionPage() {
               key={plan.uuid}
               plan={plan}
               currentPlanLevel={my?.plan.level ?? 0}
-              usedTrial={my?.used_trial ?? false}
+              usedTrial={usedTrial}
               onPurchase={(period) => setPurchaseTarget(period)}
             />
           ))}
diff --git a/assets/admin/types/index.ts b/assets/admin/types/index.ts
index e5d012bc..da9a24c6 100644
--- a/assets/admin/types/index.ts
+++ b/assets/admin/types/index.ts
@@ -337,6 +337,18 @@ export interface SubscriptionPeriod {
   is_trial: boolean;
 }
 
+export interface MySubscriptionData {
+  subscription: {
+    plan: { name: string; level: number; features: Record<string, boolean> };
+    period?: { label: string; duration_months: number };
+    is_trial: boolean;
+    starts_at?: number;
+    expires_at?: number | null;
+    days_remaining?: number;
+  } | null;
+  used_trial: boolean;
+}
+/** @deprecated use MySubscriptionData */
 export interface MySubscription {
   plan: { name: string; level: number; features: Record<string, boolean> };
   period?: { label: string; duration_months: number };