@umituz/react-native-subscription 2.37.109 → 2.37.111

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.37.109",
+  "version": "2.37.111",
   "description": "Complete subscription management with RevenueCat, paywall UI, and credits system for React Native apps",
   "main": "./src/index.ts",
   "types": "./src/index.ts",

package/src/domains/credits/application/CreditsInitializer.ts

@@ -41,14 +41,14 @@ export async function initializeCreditsTransaction(
 
         // Global cross-user deduplication: prevent the same Apple/Google transaction
         // from allocating credits under multiple Firebase UIDs.
-        if (metadata.originalTransactionId) {
-            const globalRef = doc(_db, GLOBAL_TRANSACTION_COLLECTION, metadata.originalTransactionId);
+        if (metadata.storeTransactionId) {
+            const globalRef = doc(_db, GLOBAL_TRANSACTION_COLLECTION, metadata.storeTransactionId);
             const globalDoc = await transaction.get(globalRef);
             if (globalDoc.exists()) {
                 const globalData = globalDoc.data();
                 if (globalData?.ownerUserId && globalData.ownerUserId !== userId) {
                     console.warn(
-                        `[CreditsInitializer] Transaction ${metadata.originalTransactionId} already processed by user ${globalData.ownerUserId}, skipping for ${userId}`
+                        `[CreditsInitializer] Transaction ${metadata.storeTransactionId} already processed by user ${globalData.ownerUserId}, skipping for ${userId}`
                     );
                     return {
                         credits: existingData.credits,
@@ -89,8 +89,8 @@ export async function initializeCreditsTransaction(
         transaction.set(creditsRef, creditsData, { merge: true });
 
         // Register transaction globally so other UIDs cannot claim the same purchase.
-        if (metadata.originalTransactionId) {
-            const globalRef = doc(_db, GLOBAL_TRANSACTION_COLLECTION, metadata.originalTransactionId);
+        if (metadata.storeTransactionId) {
+            const globalRef = doc(_db, GLOBAL_TRANSACTION_COLLECTION, metadata.storeTransactionId);
             transaction.set(globalRef, {
                 ownerUserId: userId,
                 purchaseId,

package/src/domains/credits/application/creditDocumentHelpers.ts

@@ -38,7 +38,7 @@ export function getCreditDocumentOrDefault(
         willRenew: false,
         productId: null,
         packageType: null,
-        originalTransactionId: null,
+        storeTransactionId: null,
         store: null,
         ownershipType: null,
         appVersion: null,

package/src/domains/credits/application/creditOperationUtils.ts

@@ -68,7 +68,7 @@ export function buildCreditsData({
     ...(isPurchaseOrRenewal && { lastPurchaseAt: serverTimestamp() }),
     ...(expirationTimestamp && { expirationDate: expirationTimestamp }),
     ...(metadata.willRenew !== undefined && { willRenew: metadata.willRenew }),
-    ...(metadata.originalTransactionId && { originalTransactionId: metadata.originalTransactionId }),
+    ...(metadata.storeTransactionId && { storeTransactionId: metadata.storeTransactionId }),
     ...(canceledAtTimestamp && { canceledAt: canceledAtTimestamp }),
     ...(billingIssueTimestamp && { billingIssueDetectedAt: billingIssueTimestamp }),
     ...(metadata.store && { store: metadata.store }),

package/src/domains/credits/core/Credits.ts

@@ -19,7 +19,7 @@ export interface UserCredits {
   willRenew: boolean | null;
   productId: string | null;
   packageType: PackageType | null;
-  originalTransactionId: string | null;
+  storeTransactionId: string | null;
   periodType: string | null;
   credits: number;
   creditLimit: number;

package/src/domains/credits/core/CreditsMapper.ts

@@ -41,7 +41,7 @@ export function mapCreditsDocumentToEntity(doc: UserCreditsDocumentRead): UserCr
     willRenew: doc.willRenew,
     productId: doc.productId,
     packageType: doc.packageType,
-    originalTransactionId: doc.originalTransactionId,
+    storeTransactionId: doc.storeTransactionId,
     periodType,
     credits: doc.credits,
     creditLimit: doc.creditLimit,

package/src/domains/credits/core/UserCreditsDocument.ts

@@ -42,7 +42,7 @@ export interface UserCreditsDocumentRead {
     willRenew: boolean | null;
     productId: string | null;
     packageType: PackageType | null;
-    originalTransactionId: string | null;
+    storeTransactionId: string | null;
     store: Store | null;
     ownershipType: OwnershipType | null;
     periodType: string | null;

package/src/domains/credits/infrastructure/CreditsRepository.ts

@@ -8,7 +8,8 @@ import { refundCreditsOperation } from "../application/RefundCreditsCommand";
 import { PURCHASE_TYPE, type PurchaseType } from "../../subscription/core/SubscriptionConstants";
 import { requireFirestore, buildDocRef, type CollectionConfig } from "../../../shared/infrastructure/firestore";
 import { fetchCredits, checkHasCredits, documentExists } from "./operations/CreditsFetcher";
-import { syncExpiredStatus, syncPremiumMetadata, createRecoveryCreditsDocument, type PremiumMetadata } from "./operations/CreditsWriter";
+import { syncExpiredStatus, syncPremiumMetadata, createRecoveryCreditsDocument } from "./operations/CreditsWriter";
+import type { SubscriptionMetadata } from "../../subscription/core/types";
 import { initializeCreditsWithRetry } from "./operations/CreditsInitializer";
 import { calculateCreditLimit } from "../application/CreditLimitCalculator";
 
@@ -81,7 +82,7 @@ export class CreditsRepository extends BaseRepository {
     await syncExpiredStatus(this.getRef(db, userId));
   }
 
-  async syncPremiumMetadata(userId: string, metadata: PremiumMetadata): Promise<void> {
+  async syncPremiumMetadata(userId: string, metadata: SubscriptionMetadata): Promise<void> {
     const db = requireFirestore();
     await syncPremiumMetadata(this.getRef(db, userId), metadata);
   }
@@ -92,7 +93,7 @@ export class CreditsRepository extends BaseRepository {
     willRenew: boolean,
     expirationDate: string | null,
     periodType: string | null,
-    originalTransactionId?: string | null,
+    storeTransactionId?: string | null,
   ): Promise<boolean> {
     const db = requireFirestore();
     const creditLimit = calculateCreditLimit(productId, this.config);
@@ -105,7 +106,7 @@ export class CreditsRepository extends BaseRepository {
       periodType,
       db,
       userId,
-      originalTransactionId,
+      storeTransactionId,
     );
   }
 }

package/src/domains/credits/infrastructure/operations/CreditsInitializer.ts

@@ -63,7 +63,7 @@ export async function initializeCreditsWithRetry(params: InitializeCreditsParams
           source,
           expirationDate: revenueCatData.expirationDate,
           willRenew: revenueCatData.willRenew,
-          originalTransactionId: revenueCatData.originalTransactionId,
+          storeTransactionId: revenueCatData.storeTransactionId,
           isPremium: revenueCatData.isPremium,
           periodType: revenueCatData.periodType,
           unsubscribeDetectedAt: revenueCatData.unsubscribeDetectedAt,

package/src/domains/credits/infrastructure/operations/CreditsWriter.ts

@@ -3,6 +3,7 @@ import { runTransaction, serverTimestamp } from "@umituz/react-native-firebase";
 import { doc, getDoc, setDoc } from "firebase/firestore";
 import { SUBSCRIPTION_STATUS } from "../../../subscription/core/SubscriptionConstants";
 import { resolveSubscriptionStatus } from "../../../subscription/core/SubscriptionStatus";
+import type { SubscriptionMetadata } from "../../../subscription/core/types";
 import { toTimestamp } from "../../../../shared/utils/dateConverter";
 import { isPast } from "../../../../utils/dateUtils";
 import { getAppVersion, validatePlatform } from "../../../../utils/appUtils";
@@ -25,22 +26,10 @@ export async function syncExpiredStatus(ref: DocumentReference): Promise<void> {
   });
 }
 
-export interface PremiumMetadata {
-  isPremium: boolean;
-  willRenew: boolean;
-  expirationDate: string | null;
-  productId: string;
-  periodType: string | null;
-  unsubscribeDetectedAt: string | null;
-  billingIssueDetectedAt: string | null;
-  store: string | null;
-  ownershipType: string | null;
-}
-
 // Fix: was getDoc+setDoc (non-atomic) — now uses runTransaction.
 export async function syncPremiumMetadata(
   ref: DocumentReference,
-  metadata: PremiumMetadata
+  metadata: SubscriptionMetadata
 ): Promise<void> {
   await runTransaction(async (tx: Transaction) => {
     const doc = await tx.get(ref);
@@ -78,7 +67,7 @@ export async function syncPremiumMetadata(
  * This handles edge cases like test store purchases, reinstalls, or failed initializations.
  * Returns true if a new document was created, false if one already existed.
  *
- * Cross-user guard: if originalTransactionId is provided and already registered
+ * Cross-user guard: if storeTransactionId is provided and already registered
  * to a different user in the global processedTransactions collection, the recovery
  * document is NOT created (the subscription belongs to another UID).
  */
@@ -91,22 +80,22 @@ export async function createRecoveryCreditsDocument(
   periodType: string | null,
   db?: Firestore,
   userId?: string,
-  originalTransactionId?: string | null,
+  storeTransactionId?: string | null,
 ): Promise<boolean> {
   const existingDoc = await getDoc(ref);
   if (existingDoc.exists()) return false;
 
   // Cross-user deduplication: if this transaction was already processed by another
   // user, skip recovery to prevent double credit allocation across UIDs.
-  if (db && userId && originalTransactionId) {
+  if (db && userId && storeTransactionId) {
     try {
-      const globalRef = doc(db, GLOBAL_TRANSACTION_COLLECTION, originalTransactionId);
+      const globalRef = doc(db, GLOBAL_TRANSACTION_COLLECTION, storeTransactionId);
       const globalDoc = await getDoc(globalRef);
       if (globalDoc.exists()) {
         const globalData = globalDoc.data();
         if (globalData?.ownerUserId && globalData.ownerUserId !== userId) {
           console.warn(
-            `[CreditsWriter] Recovery skipped: transaction ${originalTransactionId} belongs to user ${globalData.ownerUserId}, not ${userId}`
+            `[CreditsWriter] Recovery skipped: transaction ${storeTransactionId} belongs to user ${globalData.ownerUserId}, not ${userId}`
           );
           return false;
         }

package/src/domains/revenuecat/core/types/RevenueCatData.ts

@@ -1,15 +1,9 @@
-import type { Store, OwnershipType, PackageType } from "./RevenueCatTypes";
+import type { SubscriptionMetadata } from "../../../subscription/core/types";
+import type { PackageType } from "./RevenueCatTypes";
 
-export interface RevenueCatData {
-  expirationDate: string | null;
+export interface RevenueCatData extends Omit<SubscriptionMetadata, 'willRenew' | 'productId'> {
   willRenew: boolean | null;
-  originalTransactionId: string | null;
-  isPremium: boolean;
-  periodType: string | null;
+  storeTransactionId: string | null;
   packageType: PackageType | null;
-  unsubscribeDetectedAt: string | null;
-  billingIssueDetectedAt: string | null;
-  store: Store | null;
-  ownershipType: OwnershipType | null;
   revenueCatUserId?: string | null;
 }

package/src/domains/revenuecat/infrastructure/services/userSwitchHandler.ts

@@ -193,10 +193,14 @@ export async function handleInitialConfiguration(
             userId: normalizedUserId,
             isPremium: true,
             productId: premiumEntitlement.productIdentifier,
-            expiresAt: premiumEntitlement.expirationDate ?? undefined,
+            expirationDate: premiumEntitlement.expirationDate ?? null,
             willRenew: premiumEntitlement.willRenew,
             periodType: premiumEntitlement.periodType as PeriodType | undefined,
-            originalTransactionId: subscription?.storeTransactionId ?? undefined,
+            storeTransactionId: subscription?.storeTransactionId ?? undefined,
+            unsubscribeDetectedAt: premiumEntitlement.unsubscribeDetectedAt ?? null,
+            billingIssueDetectedAt: premiumEntitlement.billingIssueDetectedAt ?? null,
+            store: premiumEntitlement.store ?? null,
+            ownershipType: premiumEntitlement.ownershipType ?? null,
           });
         } else {
           await deps.config.onPremiumStatusChanged({

package/src/domains/subscription/application/SubscriptionInitializerTypes.ts

@@ -1,7 +1,7 @@
 import type { CreditsConfig } from "../../credits/core/Credits";
 import type { UserCreditsDocumentRead } from "../../credits/core/UserCreditsDocument";
 import type { PurchaseSource, PurchaseType } from "../core/SubscriptionConstants";
-import type { Store, OwnershipType } from "../../revenuecat/core/types";
+import type { SubscriptionMetadata } from "../core/types";
 
 export interface FirebaseAuthLike {
   currentUser: { uid: string; isAnonymous: boolean } | null;
@@ -28,19 +28,11 @@ export interface SubscriptionInitConfig {
   authStateTimeoutMs?: number;
 }
 
-export interface InitializeCreditsMetadata {
-  productId: string;
+export interface InitializeCreditsMetadata extends Omit<SubscriptionMetadata, 'willRenew'> {
   source: PurchaseSource;
   type: PurchaseType;
-  expirationDate: string | null;
   willRenew: boolean | null;
-  originalTransactionId: string | null;
-  isPremium: boolean;
-  periodType: string | null;
-  unsubscribeDetectedAt: string | null;
-  billingIssueDetectedAt: string | null;
-  store: Store | null;
-  ownershipType: OwnershipType | null;
+  storeTransactionId: string | null;
   revenueCatUserId?: string | null;
 }
 

package/src/domains/subscription/application/SubscriptionSyncProcessor.ts

@@ -110,7 +110,7 @@ export class SubscriptionSyncProcessor {
       revenueCatData.packageType = event.packageType ?? null;
       const revenueCatAppUserId = await this.getRevenueCatAppUserId();
       revenueCatData.revenueCatUserId = revenueCatAppUserId ?? event.userId;
-      const purchaseId = generatePurchaseId(revenueCatData.originalTransactionId, event.productId);
+      const purchaseId = generatePurchaseId(revenueCatData.storeTransactionId, event.productId);
 
       const creditsUserId = await this.getCreditsUserId(event.userId);
 
@@ -140,7 +140,7 @@ export class SubscriptionSyncProcessor {
       revenueCatData.expirationDate = event.newExpirationDate ?? revenueCatData.expirationDate;
       const revenueCatAppUserId = await this.getRevenueCatAppUserId();
       revenueCatData.revenueCatUserId = revenueCatAppUserId ?? event.userId;
-      const purchaseId = generateRenewalId(revenueCatData.originalTransactionId, event.productId, event.newExpirationDate);
+      const purchaseId = generateRenewalId(revenueCatData.storeTransactionId, event.productId, event.newExpirationDate);
 
       const creditsUserId = await this.getCreditsUserId(event.userId);
 
@@ -220,9 +220,9 @@ export class SubscriptionSyncProcessor {
         userId,
         event.productId!,
         event.willRenew ?? false,
-        event.expiresAt ?? null,
+        event.expirationDate ?? null,
         event.periodType ?? null,
-        event.originalTransactionId,
+        event.storeTransactionId,
       );
       if (__DEV__ && created) {
         console.log('[SubscriptionSyncProcessor] Recovery: created missing credits document for premium user', {
@@ -235,13 +235,13 @@ export class SubscriptionSyncProcessor {
     await repo.syncPremiumMetadata(userId, {
       isPremium: event.isPremium,
       willRenew: event.willRenew ?? false,
-      expirationDate: event.expiresAt ?? null,
+      expirationDate: event.expirationDate ?? null,
       productId: event.productId!,
       periodType: event.periodType ?? null,
-      unsubscribeDetectedAt: null,
-      billingIssueDetectedAt: null,
-      store: null,
-      ownershipType: null,
+      unsubscribeDetectedAt: event.unsubscribeDetectedAt ?? null,
+      billingIssueDetectedAt: event.billingIssueDetectedAt ?? null,
+      store: event.store ?? null,
+      ownershipType: event.ownershipType ?? null,
     });
     this.emitCreditsUpdated(userId);
   }

package/src/domains/subscription/application/SubscriptionSyncUtils.ts

@@ -23,7 +23,7 @@ export const extractRevenueCatData = (customerInfo: CustomerInfo, entitlementId:
     return {
       expirationDate: null,
       willRenew: null,
-      originalTransactionId: null,
+      storeTransactionId: null,
       periodType: null,
       packageType: null,
       isPremium: false,
@@ -39,11 +39,11 @@ export const extractRevenueCatData = (customerInfo: CustomerInfo, entitlementId:
   return {
     expirationDate: entitlement.expirationDate ?? null,
     willRenew: entitlement.willRenew ?? null,
-    // Maps SDK's `storeTransactionId` (current transaction ID from Apple/Google)
-    // to our domain's `originalTransactionId`. Used as dedup key in processedTransactions.
-    // Note: The SDK does not expose `original_store_transaction_id` (the first purchase's
-    // ID that stays constant across renewals) — only available via server-side webhooks.
-    originalTransactionId: subscription?.storeTransactionId ?? null,
+    // Current transaction ID from Apple/Google — changes with each renewal.
+    // Used as dedup key in processedTransactions collection.
+    // Note: original_store_transaction_id (stable across renewals) is only
+    // available server-side (webhooks/REST API), not in the client SDK.
+    storeTransactionId: subscription?.storeTransactionId ?? null,
     periodType: validatePeriodType(entitlement.periodType),
     packageType: null,
     isPremium: true,

package/src/domains/subscription/application/syncIdGenerators.ts

@@ -1,13 +1,13 @@
 const uniqueSuffix = (): string => `${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
 
-export const generatePurchaseId = (originalTransactionId: string | null, productId: string): string => {
-  return originalTransactionId
-    ? `purchase_${originalTransactionId}`
+export const generatePurchaseId = (storeTransactionId: string | null, productId: string): string => {
+  return storeTransactionId
+    ? `purchase_${storeTransactionId}`
     : `purchase_${productId}_${uniqueSuffix()}`;
 };
 
-export const generateRenewalId = (originalTransactionId: string | null, productId: string, expirationDate: string): string => {
-  return originalTransactionId
-    ? `renewal_${originalTransactionId}_${expirationDate}`
+export const generateRenewalId = (storeTransactionId: string | null, productId: string, expirationDate: string): string => {
+  return storeTransactionId
+    ? `renewal_${storeTransactionId}_${expirationDate}`
     : `renewal_${productId}_${uniqueSuffix()}`;
 };

package/src/domains/subscription/core/SubscriptionEvents.ts

@@ -1,5 +1,6 @@
 import type { CustomerInfo } from "react-native-purchases";
-import type { PeriodType, PurchaseSource } from "./SubscriptionConstants";
+import type { PurchaseSource } from "./SubscriptionConstants";
+import type { SubscriptionMetadata } from "./types";
 import type { PackageType } from "../../revenuecat/core/types/RevenueCatTypes";
 
 export interface PurchaseCompletedEvent {
@@ -17,14 +18,10 @@ export interface RenewalDetectedEvent {
   customerInfo: CustomerInfo;
 }
 
-export interface PremiumStatusChangedEvent {
+export interface PremiumStatusChangedEvent extends Partial<SubscriptionMetadata> {
   userId: string;
   isPremium: boolean;
-  productId?: string;
-  expiresAt?: string;
-  willRenew?: boolean;
-  periodType?: PeriodType;
-  originalTransactionId?: string;
+  storeTransactionId?: string;
 }
 
 export interface PlanChangedEvent {

package/src/domains/subscription/core/SubscriptionStatus.ts

@@ -12,7 +12,7 @@ export type { SubscriptionStatusType };
 
 export interface SubscriptionStatus {
     isPremium: boolean;
-    expiresAt: string | null;
+    expirationDate: string | null;
     productId: string | null;
     purchasedAt?: string | null;
     customerId?: string | null;
@@ -23,7 +23,7 @@ export interface SubscriptionStatus {
 
 export const createDefaultSubscriptionStatus = (): SubscriptionStatus => ({
     isPremium: false,
-    expiresAt: null,
+    expirationDate: null,
     productId: null,
     purchasedAt: null,
     customerId: null,
@@ -33,8 +33,8 @@ export const createDefaultSubscriptionStatus = (): SubscriptionStatus => ({
 
 export const isSubscriptionValid = (status: SubscriptionStatus | null): boolean => {
     if (!status || !status.isPremium) return false;
-    if (!status.expiresAt) return true;
-    return timezoneService.isFuture(new Date(status.expiresAt));
+    if (!status.expirationDate) return true;
+    return timezoneService.isFuture(new Date(status.expirationDate));
 };
 
 export interface StatusResolverInput {

package/src/domains/subscription/core/types/CreditInfo.ts

@@ -0,0 +1,10 @@
+/**
+ * Credit usage information for display in subscription UI components.
+ * Single source of truth — used by SubscriptionDetailScreen and PremiumDetailsCard.
+ */
+export interface CreditInfo {
+  id: string;
+  label: string;
+  current: number;
+  total: number;
+}

package/src/domains/subscription/core/types/PremiumStatus.ts

@@ -0,0 +1,21 @@
+/**
+ * Resolved premium status from RevenueCat CustomerInfo.
+ * Uses Date objects (presentation-ready).
+ *
+ * Extended by SubscriptionStatusResult which adds hook state (isLoading, error, refetch).
+ */
+export interface PremiumStatus {
+  isPremium: boolean;
+  expirationDate: Date | null;
+  willRenew: boolean;
+  productIdentifier: string | null;
+  originalPurchaseDate: Date | null;
+  latestPurchaseDate: Date | null;
+  billingIssuesDetected: boolean;
+  isSandbox: boolean;
+  periodType: string | null;
+  packageType: string | null;
+  store: string | null;
+  gracePeriodExpiresDate: Date | null;
+  unsubscribeDetectedAt: Date | null;
+}

package/src/domains/subscription/core/types/SubscriptionMetadata.ts

@@ -0,0 +1,18 @@
+/**
+ * Base subscription metadata — the single source of truth for subscription state fields.
+ *
+ * All subscription-related types (RevenueCatData, PremiumStatusChangedEvent,
+ * InitializeCreditsMetadata) extend or compose from this base to eliminate
+ * field duplication and ensure consistent naming.
+ */
+export interface SubscriptionMetadata {
+  isPremium: boolean;
+  willRenew: boolean;
+  expirationDate: string | null;
+  productId: string;
+  periodType: string | null;
+  unsubscribeDetectedAt: string | null;
+  billingIssueDetectedAt: string | null;
+  store: string | null;
+  ownershipType: string | null;
+}

package/src/domains/subscription/core/types/index.ts

@@ -0,0 +1,3 @@
+export type { SubscriptionMetadata } from "./SubscriptionMetadata";
+export type { PremiumStatus } from "./PremiumStatus";
+export type { CreditInfo } from "./CreditInfo";

package/src/domains/subscription/infrastructure/handlers/PurchaseStatusResolver.ts

@@ -2,22 +2,9 @@ import type { CustomerInfo } from "react-native-purchases";
 import { getPremiumEntitlement } from "../../../revenuecat/core/types";
 import { toDate } from "../../../../shared/utils/dateConverter";
 import { detectPackageType } from "../../../../utils/packageTypeDetector";
+import type { PremiumStatus } from "../../core/types";
 
-export interface PremiumStatus {
-  isPremium: boolean;
-  expirationDate: Date | null;
-  willRenew: boolean;
-  productIdentifier: string | null;
-  originalPurchaseDate: Date | null;
-  latestPurchaseDate: Date | null;
-  billingIssuesDetected: boolean;
-  isSandbox: boolean;
-  periodType: string | null;
-  packageType: string | null;
-  store: string | null;
-  gracePeriodExpiresDate: Date | null;
-  unsubscribeDetectedAt: Date | null;
-}
+export type { PremiumStatus };
 
 export class PurchaseStatusResolver {
   static resolve(customerInfo: CustomerInfo, entitlementId: string): PremiumStatus {

package/src/domains/subscription/infrastructure/managers/SubscriptionManager.types.ts

@@ -1,5 +1,5 @@
 import type { RevenueCatConfig } from "../../../revenuecat/core/types";
-import type { PremiumStatus } from "../handlers/PurchaseStatusResolver";
+import type { PremiumStatus } from "../../core/types";
 import type { RestoreResultInfo } from "../handlers/package-operations/types";
 
 export interface SubscriptionManagerConfig {

package/src/domains/subscription/infrastructure/utils/PremiumStatusSyncer.ts

@@ -36,10 +36,14 @@ export async function syncPremiumStatus(
                 userId,
                 isPremium: true,
                 productId: premiumEntitlement.productIdentifier,
-                expiresAt: premiumEntitlement.expirationDate ?? undefined,
+                expirationDate: premiumEntitlement.expirationDate ?? null,
                 willRenew: premiumEntitlement.willRenew,
                 periodType: premiumEntitlement.periodType as PeriodType | undefined,
-                originalTransactionId: subscription?.storeTransactionId ?? undefined,
+                storeTransactionId: subscription?.storeTransactionId ?? undefined,
+                unsubscribeDetectedAt: premiumEntitlement.unsubscribeDetectedAt ?? null,
+                billingIssueDetectedAt: premiumEntitlement.billingIssueDetectedAt ?? null,
+                store: premiumEntitlement.store ?? null,
+                ownershipType: premiumEntitlement.ownershipType ?? null,
             });
         } else {
             await config.onPremiumStatusChanged({ userId, isPremium: false });

package/src/domains/subscription/presentation/components/details/PremiumDetailsCardTypes.ts

@@ -1,11 +1,7 @@
 import type { SubscriptionStatusType } from "./PremiumStatusBadge";
+import type { CreditInfo } from "../../../core/types";
 
-export interface CreditInfo {
-  id: string;
-  label: string;
-  current: number;
-  total: number;
-}
+export type { CreditInfo };
 
 export interface PremiumDetailsTranslations {
   title: string;

package/src/domains/subscription/presentation/screens/SubscriptionDetailScreen.types.ts

@@ -1,4 +1,7 @@
 import type { SubscriptionStatusType } from "../../core/SubscriptionConstants";
+import type { CreditInfo } from "../../core/types";
+
+export type { CreditInfo };
 
 export interface SubscriptionDisplayFlags {
   showHeader: boolean;
@@ -40,13 +43,6 @@ export interface UpgradePromptConfig {
   onUpgrade?: () => void;
 }
 
-export interface CreditInfo {
-  id: string;
-  label: string;
-  current: number;
-  total: number;
-}
-
 export interface SubscriptionDetailConfig {
   display: SubscriptionDisplayFlags;
   statusType: SubscriptionStatusType;

package/src/domains/subscription/presentation/useSubscriptionStatus.types.ts

@@ -1,17 +1,6 @@
-export interface SubscriptionStatusResult {
-  isPremium: boolean;
-  expirationDate: Date | null;
-  willRenew: boolean;
-  productIdentifier: string | null;
-  originalPurchaseDate: Date | null;
-  latestPurchaseDate: Date | null;
-  billingIssuesDetected: boolean;
-  isSandbox: boolean;
-  periodType: string | null;
-  packageType: string | null;
-  store: string | null;
-  gracePeriodExpiresDate: Date | null;
-  unsubscribeDetectedAt: Date | null;
+import type { PremiumStatus } from "../core/types";
+
+export interface SubscriptionStatusResult extends PremiumStatus {
   isLoading: boolean;
   error: Error | null;
   refetch: () => void;

package/src/index.ts

@@ -1,5 +1,6 @@
 // Domain Layer - Constants & Types
 export * from "./domains/subscription/core/SubscriptionConstants";
+export type { SubscriptionMetadata, PremiumStatus, CreditInfo } from "./domains/subscription/core/types";
 export {
   createDefaultSubscriptionStatus,
   isSubscriptionValid,
@@ -57,7 +58,6 @@ export type {
   SubscriptionDetailTranslations,
   SubscriptionDisplayFlags,
   UpgradePromptConfig,
-  CreditInfo,
 } from "./domains/subscription/presentation/screens/SubscriptionDetailScreen.types";
 export * from "./domains/paywall/components/PaywallContainer";