@umituz/react-native-subscription 2.27.96 → 2.27.98

package/src/domains/subscription/presentation/screens/SubscriptionDetailScreen.tsx

@@ -11,22 +11,55 @@ import {
     ScreenLayout,
 } from "@umituz/react-native-design-system";
 import { SubscriptionHeader } from "./components/SubscriptionHeader";
-import { CreditsList } from "./components/CreditsList";
-import { UpgradePrompt } from "./components/UpgradePrompt";
-import { DevTestSection } from "./components/DevTestSection";
-import type { SubscriptionDetailScreenProps } from "../types/SubscriptionDetailTypes";
+import { CreditsList, type CreditItem } from "./components/CreditsList";
+import { UpgradePrompt, type Benefit } from "./components/UpgradePrompt";
 
-export type {
-  SubscriptionDisplayFlags,
-  SubscriptionDetailTranslations,
-  SubscriptionDetailConfig,
-  SubscriptionDetailScreenProps,
-  DevTestActions,
-  DevToolsConfig,
-  UpgradeBenefit,
-  UpgradePromptConfig,
-  UpgradePromptProps,
-} from "../types/SubscriptionDetailTypes";
+export interface SubscriptionDisplayFlags {
+  showHeader: boolean;
+  showCredits: boolean;
+  showUpgradePrompt: boolean;
+  showExpirationDate: boolean;
+}
+
+export interface SubscriptionDetailTranslations {
+  title: string;
+  statusActive: string;
+  statusExpired: string;
+  statusFree: string;
+  statusCanceled: string;
+  statusLabel: string;
+  lifetimeLabel: string;
+  expiresLabel: string;
+  purchasedLabel: string;
+  usageTitle?: string;
+  creditsTitle: string;
+  creditsResetInfo?: string;
+  remainingLabel?: string;
+  upgradeButton: string;
+}
+
+export interface UpgradePromptConfig {
+  title: string;
+  subtitle?: string;
+  benefits?: readonly Benefit[];
+  onUpgrade?: () => void;
+}
+
+export interface SubscriptionDetailConfig {
+  display: SubscriptionDisplayFlags;
+  statusType: "active" | "expired" | "none" | "canceled";
+  isLifetime: boolean;
+  expirationDate?: string;
+  purchaseDate?: string;
+  daysRemaining?: number | null;
+  credits?: readonly CreditItem[];
+  translations: SubscriptionDetailTranslations;
+  upgradePrompt?: UpgradePromptConfig;
+}
+
+export interface SubscriptionDetailScreenProps {
+  config: SubscriptionDetailConfig;
+}
 
 export const SubscriptionDetailScreen: React.FC<
   SubscriptionDetailScreenProps
@@ -59,14 +92,6 @@ export const SubscriptionDetailScreen: React.FC<
       edges={["bottom"]}
       backgroundColor={tokens.colors.backgroundPrimary}
       contentContainerStyle={styles.content}
-      footer={
-        config.devTools ? (
-          <DevTestSection
-            actions={config.devTools.actions}
-            title={config.devTools.title}
-          />
-        ) : undefined
-      }
     >
       <View style={styles.cardsContainer}>
         {showHeader && (
@@ -98,7 +123,7 @@ export const SubscriptionDetailScreen: React.FC<
             subtitle={config.upgradePrompt.subtitle}
             benefits={config.upgradePrompt.benefits}
             upgradeButtonLabel={config.translations.upgradeButton}
-            onUpgrade={config.onUpgrade}
+            onUpgrade={config.upgradePrompt.onUpgrade ?? (() => {})}
           />
         )}
       </View>

package/src/domains/subscription/presentation/screens/components/CreditsList.tsx

@@ -7,7 +7,20 @@ import React, { useMemo } from "react";
 import { View, StyleSheet } from "react-native";
 import { useAppDesignTokens, AtomicText } from "@umituz/react-native-design-system";
 import { CreditRow } from "../../components/details/CreditRow";
-import type { CreditsListProps } from "../../types/SubscriptionDetailTypes";
+
+export interface CreditItem {
+  id: string;
+  label: string;
+  current: number;
+  total: number;
+}
+
+export interface CreditsListProps {
+  credits: readonly CreditItem[];
+  title?: string;
+  description?: string;
+  remainingLabel?: string;
+}
 
 export const CreditsList: React.FC<CreditsListProps> = ({
   credits,

package/src/domains/subscription/presentation/screens/components/SubscriptionActions.tsx

@@ -6,7 +6,12 @@
 import React, { useMemo } from "react";
 import { View, StyleSheet, TouchableOpacity } from "react-native";
 import { useAppDesignTokens, AtomicText } from "@umituz/react-native-design-system";
-import type { SubscriptionActionsProps } from "../../types/SubscriptionDetailTypes";
+
+export interface SubscriptionActionsProps {
+  isPremium: boolean;
+  upgradeButtonLabel?: string;
+  onUpgrade?: () => void;
+}
 
 export const SubscriptionActions: React.FC<SubscriptionActionsProps> = ({
   isPremium,

package/src/domains/subscription/presentation/screens/components/SubscriptionHeader.tsx

@@ -8,7 +8,26 @@ import { View, StyleSheet } from "react-native";
 import { useAppDesignTokens, AtomicText } from "@umituz/react-native-design-system";
 import { PremiumStatusBadge } from "../../components/details/PremiumStatusBadge";
 import { DetailRow } from "../../components/details/DetailRow";
-import type { SubscriptionHeaderProps } from "../../types/SubscriptionDetailTypes";
+
+export interface SubscriptionHeaderProps {
+  statusType: "active" | "expired" | "none" | "canceled";
+  showExpirationDate: boolean;
+  isLifetime: boolean;
+  expirationDate?: string;
+  purchaseDate?: string;
+  daysRemaining?: number | null;
+  translations: {
+    title: string;
+    statusActive: string;
+    statusExpired: string;
+    statusFree: string;
+    statusCanceled: string;
+    statusLabel: string;
+    lifetimeLabel: string;
+    expiresLabel: string;
+    purchasedLabel: string;
+  };
+}
 
 export const SubscriptionHeader: React.FC<SubscriptionHeaderProps> = ({
   statusType,

package/src/domains/subscription/presentation/screens/components/UpgradePrompt.tsx

@@ -10,7 +10,19 @@ import {
     AtomicText,
     AtomicIcon,
 } from "@umituz/react-native-design-system";
-import type { UpgradePromptProps } from "../../types/SubscriptionDetailTypes";
+
+export interface Benefit {
+  icon?: string;
+  text: string;
+}
+
+export interface UpgradePromptProps {
+  title: string;
+  subtitle?: string;
+  benefits?: readonly Benefit[];
+  upgradeButtonLabel: string;
+  onUpgrade: () => void;
+}
 
 export const UpgradePrompt: React.FC<UpgradePromptProps> = ({
   title,

package/src/domains/subscription/presentation/stores/purchaseLoadingStore.ts

@@ -49,7 +49,6 @@ export const usePurchaseLoadingStore = create<PurchaseLoadingStore>((set, get) =
       // Still update to the new purchase to recover from potential stuck state
     }
     if (__DEV__) {
-      console.log("[PurchaseLoadingStore] startPurchase:", { productId, source });
     }
     set({
       isPurchasing: true,
@@ -67,7 +66,6 @@ export const usePurchaseLoadingStore = create<PurchaseLoadingStore>((set, get) =
       // Reset to initial state to recover from potential stuck state
     }
     if (__DEV__) {
-      console.log("[PurchaseLoadingStore] endPurchase");
     }
     set({
       isPurchasing: false,
@@ -78,7 +76,6 @@ export const usePurchaseLoadingStore = create<PurchaseLoadingStore>((set, get) =
 
   reset: () => {
     if (__DEV__) {
-      console.log("[PurchaseLoadingStore] reset");
     }
     set(initialState);
   },

package/src/domains/subscription/presentation/useAuthAwarePurchase.ts

@@ -6,7 +6,7 @@
 import { useCallback } from "react";
 import type { PurchasesPackage } from "react-native-purchases";
 import { usePremium } from "./usePremium";
-import type { PurchaseSource } from "../../credits/core/Credits";
+import type { PurchaseSource } from "../core/SubscriptionConstants";
 
 export interface PurchaseAuthProvider {
   isAuthenticated: () => boolean;

package/src/domains/subscription/presentation/useFeatureGate.ts

@@ -64,48 +64,19 @@ export function useFeatureGate(params: UseFeatureGateParams): UseFeatureGateResu
   }, [requiredCredits]);
 
   useEffect(() => {
-    if (typeof __DEV__ !== "undefined" && __DEV__) {
-      console.log("[useFeatureGate] Auth credits effect", {
-        isWaiting: isWaitingForAuthCreditsRef.current,
-        isLoaded: isCreditsLoaded,
-        hasPending: !!pendingActionRef.current,
-        credits: creditBalance,
-      });
-    }
-
     if (!isWaitingForAuthCreditsRef.current || !isCreditsLoaded || !pendingActionRef.current) {
       return;
     }
 
-    if (typeof __DEV__ !== "undefined" && __DEV__) {
-      console.log("[useFeatureGate] Credits loaded after auth", {
-        credits: creditBalance,
-        hasSubscription,
-        isCreditsLoaded,
-      });
-    }
-
     isWaitingForAuthCreditsRef.current = false;
 
     if (hasSubscription || creditBalance >= requiredCredits) {
       const action = pendingActionRef.current;
       pendingActionRef.current = null;
-
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.log("[useFeatureGate] Proceeding with action after auth", {
-          credits: creditBalance,
-          hasSubscription,
-        });
-      }
       action();
       return;
     }
 
-    if (typeof __DEV__ !== "undefined" && __DEV__) {
-      console.log("[useFeatureGate] No credits after auth, showing paywall", {
-        credits: creditBalance,
-      });
-    }
     isWaitingForPurchaseRef.current = true;
     onShowPaywall(requiredCredits);
   }, [isCreditsLoaded, creditBalance, hasSubscription, requiredCredits, onShowPaywall]);
@@ -119,10 +90,6 @@ export function useFeatureGate(params: UseFeatureGateParams): UseFeatureGateResu
       const action = pendingActionRef.current;
       pendingActionRef.current = null;
       isWaitingForPurchaseRef.current = false;
-
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.log("[useFeatureGate] Access acquired (credits or subscription), executing pending action");
-      }
       action();
     }
 
@@ -132,48 +99,35 @@ export function useFeatureGate(params: UseFeatureGateParams): UseFeatureGateResu
 
   const requireFeature = useCallback(
     (action: () => void | Promise<void>) => {
-      if (typeof __DEV__ !== "undefined" && __DEV__) {
-        console.log("[useFeatureGate] requireFeature", {
-          isAuthenticated,
-          hasSubscription,
-          creditBalance: creditBalanceRef.current,
-          requiredCredits,
-          isCreditsLoaded,
-        });
-      }
-
       if (!isAuthenticated) {
         const postAuthAction = () => {
           pendingActionRef.current = action;
           isWaitingForAuthCreditsRef.current = true;
-
-          if (typeof __DEV__ !== "undefined" && __DEV__) {
-            console.log("[useFeatureGate] Auth completed, waiting for credits to load");
-          }
         };
         onShowAuthModal(postAuthAction);
         return;
       }
 
-      if (hasSubscription) {
+      // Use ref values to avoid stale closure
+      const currentHasSubscription = hasSubscriptionRef.current;
+      const currentBalance = creditBalanceRef.current;
+      const currentRequiredCredits = requiredCreditsRef.current;
+
+      if (currentHasSubscription) {
         action();
         return;
       }
 
-      const currentBalance = creditBalanceRef.current;
-      if (currentBalance < requiredCredits) {
-        if (typeof __DEV__ !== "undefined" && __DEV__) {
-          console.log("[useFeatureGate] No credits, showing paywall");
-        }
+      if (currentBalance < currentRequiredCredits) {
         pendingActionRef.current = action;
         isWaitingForPurchaseRef.current = true;
-        onShowPaywall(requiredCredits);
+        onShowPaywallRef.current(currentRequiredCredits);
         return;
       }
 
       action();
     },
-    [isAuthenticated, hasSubscription, requiredCredits, onShowAuthModal, onShowPaywall, isCreditsLoaded]
+    [isAuthenticated, onShowAuthModal, isCreditsLoaded]
   );
 
   const hasCredits = creditBalance >= requiredCredits;

package/src/domains/subscription/presentation/usePaywallVisibility.ts

@@ -5,7 +5,7 @@
  */
 
 import { useCallback, useSyncExternalStore } from "react";
-import type { PurchaseSource } from "../../credits/core/Credits";
+import type { PurchaseSource } from "../core/SubscriptionConstants";
 
 type Listener = () => void;
 

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

@@ -48,11 +48,7 @@ export const useSubscriptionStatus = (): SubscriptionStatusResult => {
       }
     },
     enabled: !!userId && SubscriptionManager.isInitializedForUser(userId),
-    staleTime: 30 * 1000, // 30 seconds
-    gcTime: 5 * 60 * 1000, // 5 minutes
-    refetchOnMount: "always",
-    refetchOnWindowFocus: true,
-    refetchOnReconnect: true,
+
   });
 
   return {

package/src/init/index.ts

@@ -7,6 +7,3 @@ export {
   createSubscriptionInitModule,
   type SubscriptionInitModuleConfig,
 } from './createSubscriptionInitModule';
-
-// Re-export InitModule from design-system for convenience
-export type { InitModule } from '@umituz/react-native-design-system';

package/src/presentation/hooks/index.ts

@@ -1,13 +1,9 @@
 export * from "../../domains/subscription/presentation/useAuthAwarePurchase";
-export * from "../../domains/subscription/presentation/useAuthSubscriptionSync";
-export * from "../../domains/subscription/presentation/useSavedPurchaseAutoExecution";
 export * from "../../domains/credits/presentation/useCredits";
 export * from "../../domains/credits/presentation/useDeductCredit";
 export * from "../../domains/subscription/presentation/useFeatureGate";
 export * from "../../domains/subscription/presentation/usePaywallVisibility";
 export * from "../../domains/subscription/presentation/usePremium";
-export * from "../../domains/subscription/presentation/usePremiumGate";
-export * from "../../domains/subscription/presentation/useSubscriptionSettingsConfig";
 export * from "../../domains/subscription/presentation/useSubscriptionStatus";
 export * from "./feedback/usePaywallFeedback";
 export * from "./feedback/useFeedbackSubmit";

package/src/shared/infrastructure/SubscriptionEventBus.ts

@@ -28,6 +28,11 @@ export class SubscriptionEventBus {
       const listeners = this.listeners[event];
       if (listeners) {
         this.listeners[event] = listeners.filter(l => l !== callback);
+
+        // Clean up empty event arrays to prevent memory leak
+        if (this.listeners[event].length === 0) {
+          delete this.listeners[event];
+        }
       }
     };
   }
@@ -42,6 +47,28 @@ export class SubscriptionEventBus {
       }
     });
   }
+
+  /**
+   * Clear all listeners for a specific event or all events
+   * Useful for cleanup during testing or app state reset
+   */
+  clear(event?: string): void {
+    if (event) {
+      delete this.listeners[event];
+    } else {
+      this.listeners = {};
+    }
+  }
+
+  /**
+   * Get listener count for debugging
+   */
+  getListenerCount(event?: string): number {
+    if (event) {
+      return this.listeners[event]?.length ?? 0;
+    }
+    return Object.values(this.listeners).reduce((total, arr) => total + arr.length, 0);
+  }
 }
 
 export const subscriptionEventBus = SubscriptionEventBus.getInstance();

package/src/utils/packageTypeDetector.ts

@@ -7,10 +7,6 @@ import { PACKAGE_TYPE, type PackageType } from "../domains/subscription/core/Sub
 
 export type SubscriptionPackageType = PackageType;
 
-/**
- * Check if identifier is a credit package (consumable purchase)
- * Credit packages use a different system and don't need type detection
- */
 /**
  * Check if identifier is a credit package (consumable purchase)
  * Credit packages use a different system and don't need type detection

package/src/domains/subscription/presentation/screens/components/DevTestSection.tsx

@@ -1,125 +0,0 @@
-/**
- * Dev Test Section
- * Developer testing tools for subscription renewals
- * Only visible in __DEV__ mode
- */
-
-import React, { useMemo } from "react";
-import { View, TouchableOpacity, StyleSheet } from "react-native";
-import { AtomicText, useAppDesignTokens } from "@umituz/react-native-design-system";
-import type { DevTestSectionProps } from "../../types/SubscriptionDetailTypes";
-
-export type { DevTestActions, DevTestSectionProps } from "../../types/SubscriptionDetailTypes";
-
-/** Dev test button translations */
-export interface DevTestTranslations {
-  title: string;
-  testRenewal: string;
-  checkCredits: string;
-  testDuplicate: string;
-}
-
-export interface DevTestSectionWithTranslationsProps extends DevTestSectionProps {
-  translations?: DevTestTranslations;
-}
-
-export const DevTestSection: React.FC<DevTestSectionWithTranslationsProps> = ({
-  actions,
-  title,
-  translations,
-}) => {
-  const tokens = useAppDesignTokens();
-
-  const styles = useMemo(
-    () =>
-      StyleSheet.create({
-        container: {
-          padding: tokens.spacing.lg,
-          gap: tokens.spacing.md,
-          borderTopWidth: 1,
-          backgroundColor: tokens.colors.surfaceSecondary,
-          borderTopColor: tokens.colors.border,
-        },
-        title: {
-          fontWeight: "600",
-          marginBottom: tokens.spacing.xs,
-        },
-        button: {
-          paddingVertical: tokens.spacing.md,
-          paddingHorizontal: tokens.spacing.lg,
-          borderRadius: tokens.radius.md,
-          alignItems: "center",
-        },
-        primaryButton: {
-          backgroundColor: tokens.colors.primary,
-        },
-        secondaryButton: {
-          backgroundColor: tokens.colors.surfaceSecondary,
-          borderWidth: 1,
-          borderColor: tokens.colors.border,
-        },
-        buttonText: {
-          fontWeight: "500",
-        },
-      }),
-    [tokens]
-  );
-
-  if (!__DEV__) {
-    return null;
-  }
-
-  const displayTitle = title || translations?.title;
-  const renewalText = translations?.testRenewal || "Test Auto-Renewal";
-  const creditsText = translations?.checkCredits || "Check Credits";
-  const duplicateText = translations?.testDuplicate || "Test Duplicate Protection";
-
-  return (
-    <View style={styles.container}>
-      {displayTitle && (
-        <AtomicText
-          type="titleMedium"
-          style={[styles.title, { color: tokens.colors.textPrimary }]}
-        >
-          {displayTitle}
-        </AtomicText>
-      )}
-
-      <TouchableOpacity
-        style={[styles.button, styles.primaryButton]}
-        onPress={actions.onTestRenewal}
-      >
-        <AtomicText
-          type="bodyMedium"
-          style={[styles.buttonText, { color: tokens.colors.onPrimary }]}
-        >
-          {renewalText}
-        </AtomicText>
-      </TouchableOpacity>
-
-      <TouchableOpacity
-        style={[styles.button, styles.secondaryButton]}
-        onPress={actions.onCheckCredits}
-      >
-        <AtomicText
-          type="bodyMedium"
-          style={[styles.buttonText, { color: tokens.colors.textPrimary }]}
-        >
-          {creditsText}
-        </AtomicText>
-      </TouchableOpacity>
-
-      <TouchableOpacity
-        style={[styles.button, styles.secondaryButton]}
-        onPress={actions.onTestDuplicate}
-      >
-        <AtomicText
-          type="bodyMedium"
-          style={[styles.buttonText, { color: tokens.colors.textPrimary }]}
-        >
-          {duplicateText}
-        </AtomicText>
-      </TouchableOpacity>
-    </View>
-  );
-};

package/src/domains/subscription/presentation/types/README.md

@@ -1,22 +0,0 @@
-# Presentation Types
-
-TypeScript type definitions and interfaces for the presentation layer.
-
-## Overview
-
-This directory contains all type definitions used by presentation components and hooks.
-
-## Contents
-
-### Subscription Types
-
-- **SubscriptionSettingsTypes.ts** - Configuration types for subscription settings UI
-- **PaywallTypes.ts** - Paywall component types
-- **SubscriptionTypes.ts** - General subscription UI types
-
-## Key Exports
-
-## Related
-
-- [Hooks](../hooks/README.md)
-- [Components](../components/README.md)