@umituz/react-native-subscription 2.14.16 → 2.14.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.14.16",
+  "version": "2.14.18",
   "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/index.ts

@@ -172,9 +172,17 @@ export {
   type SubscriptionDetailScreenProps,
   type SubscriptionDetailConfig,
   type SubscriptionDetailTranslations,
+  type DevTestActions,
+  type DevToolsConfig,
 } from "./presentation/screens/SubscriptionDetailScreen";
 
-export { type DevTestActions } from "./presentation/screens/components/DevTestSection";
+export type {
+  SubscriptionHeaderProps,
+  CreditsListProps,
+  CreditItemProps,
+  SubscriptionActionsProps,
+  DevTestSectionProps,
+} from "./presentation/types/SubscriptionDetailTypes";
 
 
 // =============================================================================

package/src/presentation/components/details/PremiumDetailsCard.tsx

@@ -63,10 +63,10 @@ export const PremiumDetailsCard: React.FC<PremiumDetailsCardProps> = ({
 
       {isPremium && (
         <View style={styles.detailsSection}>
-          {isLifetime ? (
+          {isLifetime && translations.lifetimeLabel ? (
             <DetailRow
               label={translations.statusLabel}
-              value={translations.lifetimeLabel || "Lifetime"}
+              value={translations.lifetimeLabel}
             />
           ) : (
             <>

package/src/presentation/components/details/PremiumStatusBadge.tsx

@@ -3,10 +3,11 @@
  * Displays subscription status as a colored badge
  */
 
-import React from "react";
+import React, { useMemo } from "react";
 import { View, StyleSheet } from "react-native";
 import { useAppDesignTokens, AtomicText } from "@umituz/react-native-design-system";
-import { SubscriptionStatusType } from '../../../domain/entities/SubscriptionStatus';
+import type { SubscriptionStatusType } from "../../../domain/entities/SubscriptionStatus";
+
 export type { SubscriptionStatusType };
 
 export interface PremiumStatusBadgeProps {
@@ -17,9 +18,6 @@ export interface PremiumStatusBadgeProps {
   canceledLabel: string;
 }
 
-/**
- * Badge component showing subscription status
- */
 export const PremiumStatusBadge: React.FC<PremiumStatusBadgeProps> = ({
   status,
   activeLabel,
@@ -36,32 +34,38 @@ export const PremiumStatusBadge: React.FC<PremiumStatusBadgeProps> = ({
     canceled: canceledLabel,
   };
 
-  const colors: Record<SubscriptionStatusType, string> = {
-    active: tokens.colors.success,
-    expired: tokens.colors.error,
-    none: tokens.colors.textTertiary,
-    canceled: tokens.colors.warning,
-  };
+  const backgroundColor = useMemo(() => {
+    const colors: Record<SubscriptionStatusType, string> = {
+      active: tokens.colors.success,
+      expired: tokens.colors.error,
+      none: tokens.colors.textTertiary,
+      canceled: tokens.colors.warning,
+    };
+    return colors[status];
+  }, [status, tokens.colors]);
 
-  const backgroundColor = colors[status];
-  const label = labels[status];
+  const styles = useMemo(
+    () =>
+      StyleSheet.create({
+        badge: {
+          paddingHorizontal: tokens.spacing.sm,
+          paddingVertical: tokens.spacing.xs,
+          borderRadius: tokens.borderRadius.xs,
+          backgroundColor,
+        },
+        badgeText: {
+          fontWeight: "600",
+          color: tokens.colors.onPrimary,
+        },
+      }),
+    [tokens, backgroundColor]
+  );
 
   return (
-    <View style={[styles.badge, { backgroundColor }]}>
-      <AtomicText type="labelSmall" style={[styles.badgeText, { color: tokens.colors.onPrimary }]}>
-        {label}
+    <View style={styles.badge}>
+      <AtomicText type="labelSmall" style={styles.badgeText}>
+        {labels[status]}
       </AtomicText>
     </View>
   );
 };
-
-const styles = StyleSheet.create({
-  badge: {
-    paddingHorizontal: 8,
-    paddingVertical: 4,
-    borderRadius: 4,
-  },
-  badgeText: {
-    fontWeight: "600",
-  },
-});

package/src/presentation/hooks/useSubscriptionSettingsConfig.ts

@@ -4,9 +4,9 @@
  * Package-driven: all logic handled internally
  */
 
-import { useMemo, useCallback } from "react";
-import { Linking } from "react-native";
+import { useMemo } from "react";
 import { useCredits } from "./useCredits";
+import { useSubscriptionStatus } from "./useSubscriptionStatus";
 import { useCustomerInfo } from "../../revenuecat/presentation/hooks/useCustomerInfo";
 import { usePaywallVisibility } from "./usePaywallVisibility";
 import {
@@ -45,11 +45,15 @@ export const useSubscriptionSettingsConfig = (
 
   // Internal hooks
   const { credits } = useCredits({ userId, enabled: !!userId });
+  const { isPremium: subscriptionActive } = useSubscriptionStatus({
+    userId,
+    enabled: !!userId,
+  });
   const { customerInfo } = useCustomerInfo();
   const { openPaywall } = usePaywallVisibility();
 
-  // Premium status from credits
-  const isPremium = credits !== null;
+  // Premium status from actual RevenueCat subscription
+  const isPremium = subscriptionActive;
 
   // RevenueCat entitlement info
   const premiumEntitlement = customerInfo?.entitlements.active["premium"];
@@ -74,14 +78,8 @@ export const useSubscriptionSettingsConfig = (
     [expiresAtIso]
   );
 
-  // Subscription press handler
-  const handleSubscriptionPress = useCallback(() => {
-    if (isPremium) {
-      Linking.openURL("https://apps.apple.com/account/subscriptions");
-    } else {
-      openPaywall();
-    }
-  }, [isPremium, openPaywall]);
+  // Subscription press handler - always opens paywall for upgrade
+  const handleSubscriptionPress = openPaywall;
 
   // Status type
   const statusType: SubscriptionStatusType = isPremium ? "active" : "none";
@@ -140,7 +138,6 @@ export const useSubscriptionSettingsConfig = (
           manageButton: translations.manageButton,
           upgradeButton: translations.upgradeButton,
         },
-        onManageSubscription: handleSubscriptionPress,
         onUpgrade: openPaywall,
       },
     }),
@@ -154,7 +151,6 @@ export const useSubscriptionSettingsConfig = (
       daysRemaining,
       willRenew,
       creditsArray,
-      handleSubscriptionPress,
       openPaywall,
     ]
   );

package/src/presentation/screens/SubscriptionDetailScreen.tsx

@@ -4,112 +4,96 @@
  * No business logic - pure presentation
  */
 
-import React from "react";
-import { StyleSheet } from "react-native";
+import React, { useMemo } from "react";
+import { StyleSheet, View } from "react-native";
 import { useAppDesignTokens, ScreenLayout } from "@umituz/react-native-design-system";
 import { SubscriptionHeader } from "./components/SubscriptionHeader";
 import { CreditsList } from "./components/CreditsList";
 import { SubscriptionActions } from "./components/SubscriptionActions";
-import { DevTestSection, type DevTestActions } from "./components/DevTestSection";
-import type { SubscriptionStatusType } from "../components/details/PremiumStatusBadge";
-import type { CreditInfo } from "../components/details/PremiumDetailsCard";
+import { DevTestSection } from "./components/DevTestSection";
+import type { SubscriptionDetailScreenProps } from "../types/SubscriptionDetailTypes";
 
-export interface SubscriptionDetailTranslations {
-    title: string;
-    statusLabel: string;
-    statusActive: string;
-    statusExpired: string;
-    statusFree: string;
-    statusCanceled: string;
-    expiresLabel: string;
-    purchasedLabel: string;
-    lifetimeLabel: string;
-    creditsTitle: string;
-    remainingLabel: string;
-    usageTitle?: string;
-    manageButton: string;
-    upgradeButton: string;
-    creditsResetInfo?: string;
-}
+export type {
+  SubscriptionDetailTranslations,
+  SubscriptionDetailConfig,
+  SubscriptionDetailScreenProps,
+  DevTestActions,
+  DevToolsConfig,
+} from "../types/SubscriptionDetailTypes";
 
-export interface SubscriptionDetailConfig {
-    statusType: SubscriptionStatusType;
-    isPremium: boolean;
-    expirationDate?: string | null;
-    purchaseDate?: string | null;
-    isLifetime?: boolean;
-    daysRemaining?: number | null;
-    willRenew?: boolean;
-    credits?: CreditInfo[];
-    translations: SubscriptionDetailTranslations;
-    onManageSubscription?: () => void;
-    onUpgrade?: () => void;
-    devTools?: {
-        actions: DevTestActions;
-        title?: string;
-    };
-}
+export const SubscriptionDetailScreen: React.FC<SubscriptionDetailScreenProps> = ({
+  config,
+}) => {
+  const tokens = useAppDesignTokens();
+  const showCredits = config.credits && config.credits.length > 0;
+  const showUpgradeButton = !config.isPremium && config.onUpgrade;
 
-export interface SubscriptionDetailScreenProps {
-    config: SubscriptionDetailConfig;
-}
+  const styles = useMemo(
+    () =>
+      StyleSheet.create({
+        content: {
+          flexGrow: 1,
+          padding: tokens.spacing.lg,
+          gap: tokens.spacing.lg,
+        },
+        cardsContainer: {
+          gap: tokens.spacing.lg,
+        },
+        spacer: {
+          flex: 1,
+          minHeight: tokens.spacing.xl,
+        },
+      }),
+    [tokens]
+  );
 
-export const SubscriptionDetailScreen: React.FC<
-    SubscriptionDetailScreenProps
-> = ({ config }) => {
-    const tokens = useAppDesignTokens();
-    const showCredits = config.credits && config.credits.length > 0;
+  return (
+    <ScreenLayout
+      scrollable={true}
+      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}>
+        <SubscriptionHeader
+          statusType={config.statusType}
+          isPremium={config.isPremium}
+          isLifetime={config.isLifetime}
+          expirationDate={config.expirationDate}
+          purchaseDate={config.purchaseDate}
+          daysRemaining={config.daysRemaining}
+          translations={config.translations}
+        />
 
-    return (
-        <ScreenLayout
-            scrollable={true}
-            edges={['bottom']}
-            backgroundColor={tokens.colors.backgroundPrimary}
-            contentContainerStyle={styles.content}
-            footer={
-                config.devTools ? (
-                    <DevTestSection
-                        actions={config.devTools.actions}
-                        title={config.devTools.title}
-                    />
-                ) : undefined
+        {showCredits && (
+          <CreditsList
+            credits={config.credits!}
+            title={
+              config.translations.usageTitle || config.translations.creditsTitle
             }
-        >
-            <SubscriptionHeader
-                statusType={config.statusType}
-                isPremium={config.isPremium}
-                isLifetime={config.isLifetime}
-                expirationDate={config.expirationDate}
-                purchaseDate={config.purchaseDate}
-                daysRemaining={config.daysRemaining}
-                translations={config.translations}
-            />
+            description={config.translations.creditsResetInfo}
+            remainingLabel={config.translations.remainingLabel}
+          />
+        )}
+      </View>
 
-            {showCredits && (
-                <CreditsList
-                    credits={config.credits!}
-                    title={
-                        config.translations.usageTitle || config.translations.creditsTitle
-                    }
-                    description={config.translations.creditsResetInfo}
-                    remainingLabel={config.translations.remainingLabel}
-                />
-            )}
+      <View style={styles.spacer} />
 
-            <SubscriptionActions
-                isPremium={config.isPremium}
-                manageButtonLabel={config.translations.manageButton}
-                upgradeButtonLabel={config.translations.upgradeButton}
-                onManage={config.onManageSubscription}
-                onUpgrade={config.onUpgrade}
-            />
-        </ScreenLayout>
-    );
+      {showUpgradeButton && (
+        <SubscriptionActions
+          isPremium={config.isPremium}
+          upgradeButtonLabel={config.translations.upgradeButton}
+          onUpgrade={config.onUpgrade}
+        />
+      )}
+    </ScreenLayout>
+  );
 };
-
-const styles = StyleSheet.create({
-  content: {
-    padding: 16,
-    gap: 16,
-  },
-});

package/src/presentation/screens/components/CreditItem.tsx

@@ -3,98 +3,93 @@
  * Displays individual credit usage with progress bar
  */
 
-import React from "react";
+import React, { useMemo } from "react";
 import { View, StyleSheet } from "react-native";
 import { useAppDesignTokens, AtomicText } from "@umituz/react-native-design-system";
-
-interface CreditItemProps {
-    label: string;
-    current: number;
-    total: number;
-    remainingLabel?: string;
-}
+import type { CreditItemProps } from "../../types/SubscriptionDetailTypes";
 
 export const CreditItem: React.FC<CreditItemProps> = ({
-    label,
-    current,
-    total,
-    remainingLabel = "remaining",
+  label,
+  current,
+  total,
+  remainingLabel,
 }) => {
-    const tokens = useAppDesignTokens();
-    const percentage = total > 0 ? (current / total) * 100 : 0;
-    const isLow = percentage <= 20;
-    const isMedium = percentage > 20 && percentage <= 50;
+  const tokens = useAppDesignTokens();
+  const percentage = total > 0 ? (current / total) * 100 : 0;
+  const isLow = percentage <= 20;
+  const isMedium = percentage > 20 && percentage <= 50;
+
+  const progressColor = useMemo(() => {
+    if (isLow) return tokens.colors.error;
+    if (isMedium) return tokens.colors.warning;
+    return tokens.colors.success;
+  }, [isLow, isMedium, tokens.colors]);
 
-    const getColor = () => {
-        if (isLow) return tokens.colors.error;
-        if (isMedium) return tokens.colors.warning;
-        return tokens.colors.success;
-    };
+  const styles = useMemo(
+    () =>
+      StyleSheet.create({
+        container: {
+          gap: tokens.spacing.sm,
+        },
+        header: {
+          flexDirection: "row",
+          justifyContent: "space-between",
+          alignItems: "center",
+        },
+        label: {
+          fontWeight: "500",
+        },
+        badge: {
+          paddingHorizontal: tokens.spacing.md,
+          paddingVertical: tokens.spacing.xs,
+          borderRadius: tokens.borderRadius.md,
+          backgroundColor: tokens.colors.surfaceSecondary,
+        },
+        count: {
+          fontWeight: "600",
+        },
+        progressBar: {
+          height: 8,
+          borderRadius: tokens.borderRadius.xs,
+          overflow: "hidden",
+          backgroundColor: tokens.colors.surfaceSecondary,
+        },
+        progressFill: {
+          height: "100%",
+          borderRadius: tokens.borderRadius.xs,
+          width: `${percentage}%`,
+          backgroundColor: progressColor,
+        },
+      }),
+    [tokens, percentage, progressColor]
+  );
 
-    return (
-        <View style={styles.container}>
-            <View style={styles.header}>
-                <AtomicText type="bodyMedium" style={[styles.label, { color: tokens.colors.textPrimary }]}>
-                    {label}
-                </AtomicText>
-                <View style={[styles.badge, { backgroundColor: tokens.colors.surfaceSecondary }]}>
-                    <AtomicText type="labelSmall" style={[styles.count, { color: getColor() }]}>
-                        {current} / {total}
-                    </AtomicText>
-                </View>
-            </View>
-            <View
-                style={[
-                    styles.progressBar,
-                    { backgroundColor: tokens.colors.surfaceSecondary },
-                ]}
-            >
-                <View
-                    style={[
-                        styles.progressFill,
-                        {
-                            width: `${percentage}%`,
-                            backgroundColor: getColor(),
-                        },
-                    ]}
-                />
-            </View>
-            <AtomicText type="bodySmall" style={[styles.remaining, { color: tokens.colors.textSecondary }]}>
-                {current} {remainingLabel}
-            </AtomicText>
+  return (
+    <View style={styles.container}>
+      <View style={styles.header}>
+        <AtomicText
+          type="bodyMedium"
+          style={[styles.label, { color: tokens.colors.textPrimary }]}
+        >
+          {label}
+        </AtomicText>
+        <View style={styles.badge}>
+          <AtomicText
+            type="labelSmall"
+            style={[styles.count, { color: progressColor }]}
+          >
+            {current} / {total}
+          </AtomicText>
         </View>
-    );
+      </View>
+      <View style={styles.progressBar}>
+        <View style={styles.progressFill} />
+      </View>
+      {remainingLabel && (
+        <AtomicText type="bodySmall" style={{ color: tokens.colors.textSecondary }}>
+          {current} {remainingLabel}
+        </AtomicText>
+      )}
+    </View>
+  );
 };
-
-const styles = StyleSheet.create({
-    container: {
-        gap: 8,
-    },
-    header: {
-        flexDirection: "row",
-        justifyContent: "space-between",
-        alignItems: "center",
-    },
-    label: {
-        fontWeight: "500",
-    },
-    badge: {
-        paddingHorizontal: 12,
-        paddingVertical: 4,
-        borderRadius: 12,
-    },
-    count: {
-        fontWeight: "600",
-    },
-    progressBar: {
-        height: 8,
-        borderRadius: 4,
-        overflow: "hidden",
-    },
-    progressFill: {
-        height: "100%",
-        borderRadius: 4,
-    },
-    remaining: {
-    },
-});