@umituz/react-native-subscription 2.27.42 → 2.27.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.27.42",
+  "version": "2.27.44",
   "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/paywall/components/PaywallContainer.tsx

@@ -8,8 +8,6 @@ import React, { useMemo, useEffect } from "react";
 import { usePaywallVisibility } from "../../../presentation/hooks/usePaywallVisibility";
 import { useSubscriptionPackages } from "../../../revenuecat/presentation/hooks/useSubscriptionPackages";
 import { useRevenueCatTrialEligibility } from "../../../revenuecat/presentation/hooks/useRevenueCatTrialEligibility";
-import { filterPackagesByMode } from "../../../utils/packageFilter";
-import { createCreditAmountsFromPackages } from "../../../utils/creditMapper";
 import { PaywallModal, type TrialEligibilityInfo } from "./PaywallModal";
 import { usePaywallActions } from "../hooks/usePaywallActions";
 import type { PaywallContainerProps } from "./PaywallContainer.types";
@@ -17,15 +15,12 @@ import type { PaywallContainerProps } from "./PaywallContainer.types";
 export const PaywallContainer: React.FC<PaywallContainerProps> = (props) => {
   const {
     translations,
-    mode = "subscription",
     legalUrls,
     features,
     heroImage,
     bestValueIdentifier,
-    creditsLabel,
     creditAmounts,
-    packageAllocations,
-    packageFilterConfig,
+    creditsLabel,
     source,
     onPurchaseSuccess,
     onPurchaseError,
@@ -41,7 +36,7 @@ export const PaywallContainer: React.FC<PaywallContainerProps> = (props) => {
 
   const purchaseSource = source ?? currentSource ?? "settings";
 
-  const { data: allPackages = [], isLoading } = useSubscriptionPackages();
+  const { data: packages = [], isLoading } = useSubscriptionPackages();
   const { eligibilityMap, checkEligibility } = useRevenueCatTrialEligibility();
   const { handlePurchase, handleRestore } = usePaywallActions({
     source: purchaseSource,
@@ -54,10 +49,10 @@ export const PaywallContainer: React.FC<PaywallContainerProps> = (props) => {
   // Check trial eligibility only if trialConfig is enabled
   useEffect(() => {
     if (!trialConfig?.enabled) return;
-    if (allPackages.length === 0) return;
+    if (packages.length === 0) return;
 
     // Get all actual product IDs from packages
-    const allProductIds = allPackages.map((pkg) => pkg.product.identifier);
+    const allProductIds = packages.map((pkg) => pkg.product.identifier);
 
     // If eligibleProductIds are provided, filter to matching packages (partial match)
     // e.g., "yearly" matches "futureus.yearly"
@@ -75,7 +70,7 @@ export const PaywallContainer: React.FC<PaywallContainerProps> = (props) => {
     if (productIdsToCheck.length > 0) {
       checkEligibility(productIdsToCheck);
     }
-  }, [allPackages, checkEligibility, trialConfig?.enabled, trialConfig?.eligibleProductIds]);
+  }, [packages, checkEligibility, trialConfig?.enabled, trialConfig?.eligibleProductIds]);
 
   // Convert eligibility map to format expected by PaywallModal
   // Only process if trial is enabled
@@ -92,13 +87,6 @@ export const PaywallContainer: React.FC<PaywallContainerProps> = (props) => {
     return result;
   }, [eligibilityMap, trialConfig?.enabled, trialConfig?.durationDays]);
 
-  const { filteredPackages, computedCreditAmounts } = useMemo(() => ({
-    filteredPackages: filterPackagesByMode(allPackages, mode, packageFilterConfig),
-    computedCreditAmounts: mode !== "subscription" && !creditAmounts
-      ? createCreditAmountsFromPackages(allPackages, packageAllocations)
-      : creditAmounts
-  }), [allPackages, mode, packageFilterConfig, creditAmounts, packageAllocations]);
-
   if (!isVisible) return null;
 
   return (
@@ -106,14 +94,14 @@ export const PaywallContainer: React.FC<PaywallContainerProps> = (props) => {
       visible={isVisible}
       onClose={handleClose}
       translations={translations}
-      packages={filteredPackages}
+      packages={packages}
       isLoading={isLoading}
       legalUrls={legalUrls}
       features={features ? [...features] : undefined}
       heroImage={heroImage}
       bestValueIdentifier={bestValueIdentifier}
+      creditAmounts={creditAmounts}
       creditsLabel={creditsLabel}
-      creditAmounts={computedCreditAmounts}
       onPurchase={handlePurchase}
       onRestore={handleRestore}
       trialEligibility={trialEligibility}

package/src/domains/paywall/components/PaywallContainer.types.ts

@@ -1,12 +1,11 @@
 /**
  * PaywallContainer Types
- * Props for package-driven paywall with mode-based filtering
+ * Props for subscription paywall
  */
 
 import type { ImageSourcePropType } from "react-native";
-import type { PaywallMode, PaywallTranslations, PaywallLegalUrls, SubscriptionFeature } from "../entities";
-import type { PackageFilterConfig } from "../../../utils/packageFilter";
-import type { PurchaseSource, PackageAllocationMap } from "../../../domain/entities/Credits";
+import type { PaywallTranslations, PaywallLegalUrls, SubscriptionFeature } from "../entities";
+import type { PurchaseSource } from "../../../domain/entities/Credits";
 
 /**
  * Trial display configuration
@@ -26,8 +25,6 @@ export interface TrialConfig {
 export interface PaywallContainerProps {
   /** Paywall translations - no defaults, must be provided */
   readonly translations: PaywallTranslations;
-  /** Paywall mode - subscription, credits, or hybrid */
-  readonly mode?: PaywallMode;
   /** Legal URLs for privacy and terms */
   readonly legalUrls?: PaywallLegalUrls;
   /** Feature list to display */
@@ -36,14 +33,10 @@ export interface PaywallContainerProps {
   readonly heroImage?: ImageSourcePropType;
   /** Best value package identifier for badge */
   readonly bestValueIdentifier?: string;
-  /** Credits label text */
-  readonly creditsLabel?: string;
-  /** Credit amounts per package identifier */
+  /** Credit amounts per product identifier */
   readonly creditAmounts?: Record<string, number>;
-  /** Package allocations for automatic credit amount computation */
-  readonly packageAllocations?: PackageAllocationMap;
-  /** Custom filter config for package categorization */
-  readonly packageFilterConfig?: PackageFilterConfig;
+  /** Credits label text (e.g., "credits") */
+  readonly creditsLabel?: string;
   /** Source of the paywall - affects pending purchase handling */
   readonly source?: PurchaseSource;
   /** Callback when purchase succeeds */
@@ -59,4 +52,3 @@ export interface PaywallContainerProps {
   /** Trial display configuration (Apple-compliant) */
   readonly trialConfig?: TrialConfig;
 }
-

package/src/domains/paywall/components/PaywallModal.tsx

@@ -33,7 +33,9 @@ export interface PaywallModalProps {
   isLoading?: boolean;
   legalUrls?: PaywallLegalUrls;
   bestValueIdentifier?: string;
+  /** Credit amounts per product identifier */
   creditAmounts?: Record<string, number>;
+  /** Credits label text (e.g., "credits") */
   creditsLabel?: string;
   heroImage?: ImageSourcePropType;
   onPurchase?: (pkg: PurchasesPackage) => Promise<void | boolean>;

package/src/domains/paywall/components/PlanCard.tsx

@@ -21,7 +21,9 @@ interface PlanCardProps {
     onSelect: () => void;
     /** Badge text (e.g., "Best Value") - NOT for trial */
     badge?: string;
+    /** Credit amount for this plan */
     creditAmount?: number;
+    /** Credits label text (e.g., "credits") */
     creditsLabel?: string;
     /** Whether this plan has a free trial (Apple-compliant display) */
     hasFreeTrial?: boolean;

package/src/domains/paywall/components/index.ts

@@ -9,9 +9,7 @@ export { PaywallModal } from "./PaywallModal";
 export type { PaywallModalProps } from "./PaywallModal";
 
 export { PaywallHeader } from "./PaywallHeader";
-export { PaywallTabBar } from "./PaywallTabBar";
 export { PaywallFooter } from "./PaywallFooter";
 export { FeatureList } from "./FeatureList";
 export { FeatureItem } from "./FeatureItem";
 export { PlanCard } from "./PlanCard";
-export { CreditCard } from "./CreditCard";

package/src/domains/paywall/entities/types.ts

@@ -3,25 +3,6 @@
  * All paywall-related type definitions
  */
 
-export type PaywallMode = "subscription" | "credits" | "hybrid";
-
-export type PaywallTabType = "credits" | "subscription";
-
-export interface PaywallTab {
-    id: PaywallTabType;
-    label: string;
-}
-
-export interface CreditsPackage {
-    id: string;
-    credits: number;
-    price: number;
-    currency: string;
-    bonus?: number;
-    badge?: string;
-    description?: string;
-}
-
 export interface SubscriptionFeature {
     icon: string;
     text: string;
@@ -30,10 +11,7 @@ export interface SubscriptionFeature {
 export interface PaywallTranslations {
     title: string;
     subtitle?: string;
-    creditsTabLabel?: string;
-    subscriptionTabLabel?: string;
     purchaseButtonText: string;
-    subscribeButtonText?: string;
     restoreButtonText: string;
     loadingText: string;
     emptyText: string;

package/src/domains/paywall/hooks/index.ts

@@ -2,7 +2,6 @@
  * Paywall Hooks Index
  */
 
-export { usePaywall } from './usePaywall';
 export { useSubscriptionModal } from './useSubscriptionModal';
 export { usePaywallActions } from './usePaywallActions';
 export {

package/src/utils/index.ts

@@ -2,7 +2,6 @@ export * from "./aiCreditHelpers";
 export * from "./authUtils";
 export * from "./creditChecker";
 export * from "./creditMapper";
-export * from "./packageFilter";
 export * from "./packagePeriodUtils";
 export * from "./packageTypeDetector";
 export * from "./premiumStatusUtils";

package/src/domains/paywall/components/CreditCard.tsx

@@ -1,120 +0,0 @@
-/**
- * Credit Card
- * Credit package selection card
- */
-
-import React from "react";
-import { View, TouchableOpacity, StyleSheet } from "react-native";
-import { AtomicText, AtomicIcon, AtomicBadge, useAppDesignTokens } from "@umituz/react-native-design-system";
-import type { CreditsPackage } from '../entities';
-
-import { formatPrice } from '../../../utils/priceUtils';
-
-interface CreditCardProps {
-    pkg: CreditsPackage;
-    isSelected: boolean;
-    onSelect: () => void;
-}
-
-export const CreditCard: React.FC<CreditCardProps> = React.memo(({ pkg, isSelected, onSelect }) => {
-    const tokens = useAppDesignTokens();
-    const totalCredits = pkg.credits + (pkg.bonus ?? 0);
-    const price = formatPrice(pkg.price, pkg.currency);
-
-    return (
-        <TouchableOpacity onPress={onSelect} activeOpacity={0.7} style={styles.touchable}>
-            <View
-                style={[
-                    styles.container,
-                    {
-                        backgroundColor: tokens.colors.surface,
-                        borderColor: isSelected ? tokens.colors.primary : tokens.colors.border,
-                        borderWidth: isSelected ? 2 : 1,
-                    },
-                ]}
-            >
-                {pkg.badge && (
-                    <View style={styles.badgeContainer}>
-                        <AtomicBadge text={pkg.badge} variant="warning" size="sm" />
-                    </View>
-                )}
-
-                <View style={styles.content}>
-                    <View style={styles.leftSection}>
-                        <AtomicIcon name="flash" size="md" color={isSelected ? "primary" : "secondary"} />
-                        <AtomicText
-                            type="headlineSmall"
-                            style={[styles.credits, { color: isSelected ? tokens.colors.primary : tokens.colors.textPrimary }]}
-                        >
-                            {totalCredits.toLocaleString()}
-                        </AtomicText>
-                    </View>
-
-                    <View style={styles.rightSection}>
-                        <AtomicText
-                            type="titleLarge"
-                            style={[styles.price, { color: isSelected ? tokens.colors.primary : tokens.colors.textPrimary }]}
-                        >
-                            {price}
-                        </AtomicText>
-                        {isSelected && <AtomicIcon name="checkmark-circle" size="md" color="primary" />}
-                    </View>
-                </View>
-
-                {(pkg.bonus ?? 0) > 0 && (
-                    <View style={styles.bonusRow}>
-                        <AtomicIcon name="gift-outline" size="sm" color="success" />
-                        <AtomicText type="bodySmall" style={{ color: tokens.colors.success, marginLeft: 4 }}>
-                            +{pkg.bonus}
-                        </AtomicText>
-                    </View>
-                )}
-            </View>
-        </TouchableOpacity>
-    );
-});
-
-CreditCard.displayName = "CreditCard";
-
-const styles = StyleSheet.create({
-    touchable: {
-        marginBottom: 10,
-        marginHorizontal: 24,
-    },
-    container: {
-        borderRadius: 16,
-        padding: 16,
-        position: "relative",
-    },
-    badgeContainer: {
-        position: "absolute",
-        top: -10,
-        right: 16,
-    },
-    content: {
-        flexDirection: "row",
-        justifyContent: "space-between",
-        alignItems: "center",
-    },
-    leftSection: {
-        flexDirection: "row",
-        alignItems: "center",
-    },
-    credits: {
-        fontWeight: "700",
-        marginLeft: 8,
-    },
-    rightSection: {
-        flexDirection: "row",
-        alignItems: "center",
-    },
-    price: {
-        fontWeight: "700",
-        marginRight: 8,
-    },
-    bonusRow: {
-        flexDirection: "row",
-        alignItems: "center",
-        marginTop: 8,
-    },
-});

package/src/domains/paywall/components/PaywallTabBar.tsx

@@ -1,77 +0,0 @@
-/**
- * Paywall Tab Bar
- * Segmented control for hybrid mode
- */
-
-import React from "react";
-import { View, TouchableOpacity, StyleSheet } from "react-native";
-import { AtomicText, useAppDesignTokens } from "@umituz/react-native-design-system";
-import type { PaywallTabType } from '../entities';
-
-interface PaywallTabBarProps {
-    activeTab: PaywallTabType;
-    onTabChange: (tab: PaywallTabType) => void;
-    creditsLabel: string;
-    subscriptionLabel: string;
-}
-
-export const PaywallTabBar: React.FC<PaywallTabBarProps> = React.memo(
-    ({ activeTab, onTabChange, creditsLabel, subscriptionLabel }) => {
-        const tokens = useAppDesignTokens();
-
-        const renderTab = (tab: PaywallTabType, label: string) => {
-            const isActive = activeTab === tab;
-
-            return (
-                <TouchableOpacity
-                    key={tab}
-                    style={[
-                        styles.tab,
-                        isActive ? { backgroundColor: tokens.colors.surface } : undefined,
-                    ]}
-                    onPress={() => onTabChange(tab)}
-                    activeOpacity={0.7}
-                >
-                    <AtomicText
-                        type="labelLarge"
-                        style={[
-                            styles.tabText,
-                            { color: isActive ? tokens.colors.primary : tokens.colors.textSecondary },
-                        ]}
-                    >
-                        {label}
-                    </AtomicText>
-                </TouchableOpacity>
-            );
-        };
-
-        return (
-            <View style={[styles.container, { backgroundColor: tokens.colors.surfaceSecondary }]}>
-                {renderTab("credits", creditsLabel)}
-                {renderTab("subscription", subscriptionLabel)}
-            </View>
-        );
-    }
-);
-
-PaywallTabBar.displayName = "PaywallTabBar";
-
-const styles = StyleSheet.create({
-    container: {
-        flexDirection: "row",
-        borderRadius: 12,
-        padding: 4,
-        marginHorizontal: 24,
-        marginBottom: 16,
-        height: 44,
-    },
-    tab: {
-        flex: 1,
-        alignItems: "center",
-        justifyContent: "center",
-        borderRadius: 8,
-    },
-    tabText: {
-        fontWeight: "600",
-    },
-});

package/src/domains/paywall/hooks/usePaywall.ts

@@ -1,54 +0,0 @@
-import { useState, useCallback } from "react";
-import type { PurchasesPackage } from "react-native-purchases";
-import type { PaywallTabType } from "../entities";
-
-interface UsePaywallProps {
-    initialTab?: PaywallTabType;
-    onCreditsPurchase: (packageId: string) => Promise<void>;
-    onSubscriptionPurchase: (pkg: PurchasesPackage) => Promise<void>;
-}
-
-export const usePaywall = ({
-    initialTab = "credits",
-    onCreditsPurchase,
-    onSubscriptionPurchase,
-}: UsePaywallProps) => {
-    const [activeTab, setActiveTab] = useState<PaywallTabType>(initialTab);
-    const [selectedCreditsPackageId, setSelectedCreditsPackageId] = useState<string | null>(null);
-    const [selectedSubscriptionPkg, setSelectedSubscriptionPkg] = useState<PurchasesPackage | null>(null);
-
-    const handleTabChange = useCallback((tab: PaywallTabType) => {
-        setActiveTab(tab);
-    }, []);
-
-    const handleCreditsPackageSelect = useCallback((packageId: string) => {
-        setSelectedCreditsPackageId(packageId);
-    }, []);
-
-    const handleSubscriptionPackageSelect = useCallback((pkg: PurchasesPackage) => {
-        setSelectedSubscriptionPkg(pkg);
-    }, []);
-
-    const handleCreditsPurchase = useCallback(async () => {
-        if (selectedCreditsPackageId) {
-            await onCreditsPurchase(selectedCreditsPackageId);
-        }
-    }, [selectedCreditsPackageId, onCreditsPurchase]);
-
-    const handleSubscriptionPurchase = useCallback(async () => {
-        if (selectedSubscriptionPkg) {
-            await onSubscriptionPurchase(selectedSubscriptionPkg);
-        }
-    }, [selectedSubscriptionPkg, onSubscriptionPurchase]);
-
-    return {
-        activeTab,
-        selectedCreditsPackageId,
-        selectedSubscriptionPkg,
-        handleTabChange,
-        handleCreditsPackageSelect,
-        handleSubscriptionPackageSelect,
-        handleCreditsPurchase,
-        handleSubscriptionPurchase,
-    };
-};

package/src/utils/packageFilter.ts

@@ -1,62 +0,0 @@
-/**
- * Package Filter Utility
- * Filters RevenueCat packages by type (credits vs subscription)
- */
-
-import type { PurchasesPackage } from "react-native-purchases";
-
-export type PackageCategory = "credits" | "subscription";
-
-export interface PackageFilterConfig {
-  creditIdentifierPattern?: RegExp;
-  subscriptionIdentifierPattern?: RegExp;
-}
-
-const DEFAULT_CONFIG: PackageFilterConfig = {
-  creditIdentifierPattern: /credit/i,
-  subscriptionIdentifierPattern: /(monthly|yearly|annual|weekly|premium|subscription)/i,
-};
-
-export function getPackageCategory(
-  pkg: PurchasesPackage,
-  config: PackageFilterConfig = DEFAULT_CONFIG
-): PackageCategory {
-  const identifier = pkg.identifier.toLowerCase();
-  const productIdentifier = pkg.product.identifier.toLowerCase();
-
-  const isCreditPackage =
-    config.creditIdentifierPattern?.test(identifier) ||
-    config.creditIdentifierPattern?.test(productIdentifier);
-
-  return isCreditPackage ? "credits" : "subscription";
-}
-
-export function filterPackagesByMode(
-  packages: PurchasesPackage[],
-  mode: "credits" | "subscription" | "hybrid",
-  config: PackageFilterConfig = DEFAULT_CONFIG
-): PurchasesPackage[] {
-  if (mode === "hybrid") {
-    return packages;
-  }
-
-  return packages.filter((pkg) => getPackageCategory(pkg, config) === mode);
-}
-
-export function separatePackages(
-  packages: PurchasesPackage[],
-  config: PackageFilterConfig = DEFAULT_CONFIG
-): { creditPackages: PurchasesPackage[]; subscriptionPackages: PurchasesPackage[] } {
-  const creditPackages: PurchasesPackage[] = [];
-  const subscriptionPackages: PurchasesPackage[] = [];
-
-  for (const pkg of packages) {
-    if (getPackageCategory(pkg, config) === "credits") {
-      creditPackages.push(pkg);
-    } else {
-      subscriptionPackages.push(pkg);
-    }
-  }
-
-  return { creditPackages, subscriptionPackages };
-}