@umituz/react-native-subscription 2.14.86 → 2.14.88

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.14.86",
+  "version": "2.14.88",
   "description": "Complete subscription management with RevenueCat, paywall UI, and credits system for React Native apps",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
@@ -34,7 +34,8 @@
   "dependencies": {
     "@umituz/react-native-design-system": "latest",
     "@umituz/react-native-firebase": "latest",
-    "@umituz/react-native-localization": "latest"
+    "@umituz/react-native-localization": "latest",
+    "@umituz/react-native-storage": "latest"
   },
   "peerDependencies": {
     "@tanstack/react-query": ">=5.0.0",
@@ -48,27 +49,53 @@
     "react-native-safe-area-context": ">=5.0.0"
   },
   "devDependencies": {
+    "@expo/vector-icons": "^15.0.3",
+    "@gorhom/bottom-sheet": "^5.2.8",
+    "@react-native-async-storage/async-storage": "^2.2.0",
+    "@react-native-community/datetimepicker": "^8.6.0",
+    "@react-navigation/bottom-tabs": "^7.9.0",
+    "@react-navigation/native": "^7.1.26",
+    "@react-navigation/stack": "^7.6.13",
     "@tanstack/react-query": "^5.0.0",
     "@types/react": "~19.1.10",
     "@typescript-eslint/eslint-plugin": "^8.50.1",
     "@typescript-eslint/parser": "^8.50.1",
     "@umituz/react-native-auth": "*",
-    "@umituz/react-native-storage": "*",
     "@umituz/react-native-design-system": "*",
+    "@umituz/react-native-filesystem": "^2.1.20",
     "@umituz/react-native-firebase": "*",
+    "@umituz/react-native-haptics": "^1.0.5",
     "@umituz/react-native-localization": "*",
+    "@umituz/react-native-storage": "*",
+    "@umituz/react-native-uuid": "^1.2.6",
     "eslint": "^9.39.2",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^7.0.1",
+    "expo-apple-authentication": "^8.0.8",
+    "expo-application": "^7.0.8",
+    "expo-clipboard": "^8.0.8",
     "expo-constants": "~16.0.0",
+    "expo-crypto": "^15.0.8",
+    "expo-device": "^8.0.10",
+    "expo-file-system": "^19.0.21",
+    "expo-haptics": "^15.0.8",
     "expo-image": "~3.0.0",
     "expo-linear-gradient": "~15.0.0",
+    "expo-localization": "^17.0.8",
+    "expo-sharing": "^14.0.8",
     "firebase": "^11.0.0",
+    "i18next": "^25.7.3",
     "react": "19.1.0",
+    "react-i18next": "^16.5.1",
     "react-native": "0.81.5",
+    "react-native-gesture-handler": "^2.30.0",
     "react-native-purchases": "^7.0.0",
+    "react-native-reanimated": "^4.2.1",
     "react-native-safe-area-context": "^5.0.0",
-    "typescript": "~5.9.2"
+    "react-native-svg": "^15.15.1",
+    "rn-emoji-keyboard": "^1.7.0",
+    "typescript": "~5.9.2",
+    "zustand": "^5.0.9"
   },
   "publishConfig": {
     "access": "public"

package/src/domains/wallet/domain/mappers/TransactionMapper.ts

@@ -0,0 +1,38 @@
+/**
+ * Transaction Mapper
+ * Maps Firestore data to CreditLog entity
+ */
+
+import type { QueryDocumentSnapshot, DocumentData } from "firebase/firestore";
+import type { CreditLog } from "../types/transaction.types";
+
+export class TransactionMapper {
+  static toEntity(docSnap: QueryDocumentSnapshot<DocumentData>, defaultUserId: string): CreditLog {
+    const data = docSnap.data();
+    return {
+      id: docSnap.id,
+      userId: data.userId || defaultUserId,
+      change: data.change,
+      reason: data.reason,
+      feature: data.feature,
+      jobId: data.jobId,
+      packageId: data.packageId,
+      subscriptionPlan: data.subscriptionPlan,
+      description: data.description,
+      createdAt: data.createdAt?.toMillis?.() || Date.now(),
+    };
+  }
+
+  static toFirestore(userId: string, change: number, reason: string, metadata?: Partial<CreditLog>) {
+    return {
+      userId,
+      change,
+      reason,
+      feature: metadata?.feature,
+      jobId: metadata?.jobId,
+      packageId: metadata?.packageId,
+      subscriptionPlan: metadata?.subscriptionPlan,
+      description: metadata?.description,
+    };
+  }
+}

package/src/domains/wallet/infrastructure/repositories/TransactionRepository.ts

@@ -25,6 +25,7 @@ import type {
   TransactionResult,
   TransactionReason,
 } from "../../domain/types/transaction.types";
+import { TransactionMapper } from "../../domain/mappers/TransactionMapper";
 
 export class TransactionRepository extends BaseRepository {
   private config: TransactionRepositoryConfig;
@@ -66,21 +67,9 @@ export class TransactionRepository extends BaseRepository {
       const q = query(colRef, ...constraints);
       const snapshot = await getDocs(q);
 
-      const transactions: CreditLog[] = snapshot.docs.map((docSnap) => {
-        const data = docSnap.data();
-        return {
-          id: docSnap.id,
-          userId: data.userId || options.userId,
-          change: data.change,
-          reason: data.reason,
-          feature: data.feature,
-          jobId: data.jobId,
-          packageId: data.packageId,
-          subscriptionPlan: data.subscriptionPlan,
-          description: data.description,
-          createdAt: data.createdAt?.toMillis?.() || Date.now(),
-        };
-      });
+      const transactions: CreditLog[] = snapshot.docs.map((docSnap) => 
+        TransactionMapper.toEntity(docSnap, options.userId)
+      );
 
       return { success: true, data: transactions };
     } catch (error) {
@@ -112,14 +101,7 @@ export class TransactionRepository extends BaseRepository {
     try {
       const colRef = this.getCollectionRef(db, userId);
       const docData = {
-        userId,
-        change,
-        reason,
-        feature: metadata?.feature,
-        jobId: metadata?.jobId,
-        packageId: metadata?.packageId,
-        subscriptionPlan: metadata?.subscriptionPlan,
-        description: metadata?.description,
+        ...TransactionMapper.toFirestore(userId, change, reason, metadata),
         createdAt: serverTimestamp(),
       };
 

package/src/infrastructure/mappers/CreditsMapper.ts

@@ -0,0 +1,27 @@
+/**
+ * Credits Mapper
+ * Maps Firestore data to UserCredits entity and vice-versa.
+ */
+
+import type { UserCredits } from "../../domain/entities/Credits";
+import type { UserCreditsDocumentRead } from "../models/UserCreditsDocument";
+
+export class CreditsMapper {
+  static toEntity(snapData: UserCreditsDocumentRead): UserCredits {
+    return {
+      textCredits: snapData.textCredits,
+      imageCredits: snapData.imageCredits,
+      purchasedAt: snapData.purchasedAt?.toDate?.() || new Date(),
+      lastUpdatedAt: snapData.lastUpdatedAt?.toDate?.() || new Date(),
+    };
+  }
+
+  static toFirestore(data: Partial<UserCredits>): Record<string, any> {
+    return {
+      textCredits: data.textCredits,
+      imageCredits: data.imageCredits,
+      // Timestamps are usually handled by serverTimestamp() in repos, 
+      // but we can map them if needed.
+    };
+  }
+}

package/src/infrastructure/repositories/CreditsRepository.ts

@@ -10,6 +10,8 @@ import { initializeCreditsTransaction } from "../services/CreditsInitializer";
 import { detectPackageType } from "../../utils/packageTypeDetector";
 import { getCreditAllocation } from "../../utils/creditMapper";
 
+import { CreditsMapper } from "../mappers/CreditsMapper";
+
 export class CreditsRepository extends BaseRepository {
   constructor(private config: CreditsConfig) { super(); }
 
@@ -26,7 +28,7 @@ export class CreditsRepository extends BaseRepository {
       const snap = await getDoc(this.getRef(db, userId));
       if (!snap.exists()) return { success: true, data: undefined };
       const d = snap.data() as UserCreditsDocumentRead;
-      return { success: true, data: { textCredits: d.textCredits, imageCredits: d.imageCredits, purchasedAt: d.purchasedAt?.toDate?.() || new Date(), lastUpdatedAt: d.lastUpdatedAt?.toDate?.() || new Date() } };
+      return { success: true, data: CreditsMapper.toEntity(d) };
     } catch (e: any) { return { success: false, error: { message: e.message, code: "FETCH_ERR" } }; }
   }
 
@@ -44,7 +46,14 @@ export class CreditsRepository extends BaseRepository {
         }
       }
       const res = await initializeCreditsTransaction(db, this.getRef(db, userId), cfg, purchaseId);
-      return { success: true, data: { textCredits: res.textCredits, imageCredits: res.imageCredits, purchasedAt: new Date(), lastUpdatedAt: new Date() } };
+      return { 
+        success: true, 
+        data: CreditsMapper.toEntity({
+            ...res,
+            purchasedAt: { toDate: () => new Date() } as any,
+            lastUpdatedAt: { toDate: () => new Date() } as any,
+        }) 
+      };
     } catch (e: any) { return { success: false, error: { message: e.message, code: "INIT_ERR" } }; }
   }
 

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

@@ -1,9 +1,4 @@
-/**
- * Credit Row Component
- * Displays credit information 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";
 
@@ -18,60 +13,79 @@ export const CreditRow: React.FC<CreditRowProps> = ({
   label,
   current,
   total,
-  remainingLabel = "remaining",
+  remainingLabel,
 }) => {
   const tokens = useAppDesignTokens();
   const percentage = total > 0 ? (current / total) * 100 : 0;
-  const isLow = percentage <= 20;
+  
+  // Progress color based on percentage
+  const progressColor = useMemo(() => {
+    if (percentage <= 20) return tokens.colors.error;
+    if (percentage <= 50) return tokens.colors.warning;
+    return tokens.colors.success;
+  }, [percentage, tokens.colors]);
 
   return (
     <View style={styles.container}>
       <View style={styles.header}>
-        <AtomicText type="bodySmall" style={{ color: tokens.colors.text }}>
+        <AtomicText type="bodyMedium" style={[styles.label, { color: tokens.colors.textPrimary }]}>
           {label}
         </AtomicText>
-        <AtomicText
-          type="bodySmall"
-          style={{
-            color: isLow ? tokens.colors.warning : tokens.colors.textSecondary,
-          }}
-        >
-          {current} / {total} {remainingLabel}
-        </AtomicText>
+        <View style={[styles.badge, { backgroundColor: tokens.colors.surfaceSecondary }]}>
+          <AtomicText type="labelSmall" style={[styles.count, { color: progressColor }]}>
+            {current} / {total}
+          </AtomicText>
+        </View>
       </View>
-      <View
-        style={[styles.progressBar, { backgroundColor: tokens.colors.surfaceSecondary }]}
-      >
+      <View style={[styles.progressBar, { backgroundColor: tokens.colors.surfaceSecondary }]}>
         <View
           style={[
             styles.progressFill,
             {
               width: `${percentage}%`,
-              backgroundColor: isLow ? tokens.colors.warning : tokens.colors.primary,
+              backgroundColor: progressColor,
             },
           ]}
         />
       </View>
+      {remainingLabel && (
+        <AtomicText type="bodySmall" style={{ color: tokens.colors.textSecondary }}>
+          {current} {remainingLabel}
+        </AtomicText>
+      )}
     </View>
   );
 };
 
 const styles = StyleSheet.create({
   container: {
-    gap: 4,
+    gap: 8,
+    marginVertical: 4,
   },
   header: {
     flexDirection: "row",
     justifyContent: "space-between",
     alignItems: "center",
   },
+  label: {
+    fontWeight: "500",
+  },
+  badge: {
+    paddingHorizontal: 8,
+    paddingVertical: 2,
+    borderRadius: 6,
+  },
+  count: {
+    fontWeight: "600",
+  },
   progressBar: {
-    height: 6,
-    borderRadius: 3,
+    height: 8,
+    borderRadius: 4,
     overflow: "hidden",
   },
   progressFill: {
     height: "100%",
-    borderRadius: 3,
+    borderRadius: 4,
   },
 });
+

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

@@ -4,33 +4,45 @@
  */
 
 import React from "react";
-import { View, StyleSheet } from "react-native";
+import { View, StyleSheet, type ViewStyle, type TextStyle } from "react-native";
 import { useAppDesignTokens, AtomicText } from "@umituz/react-native-design-system";
 
 export interface DetailRowProps {
   label: string;
   value: string;
   highlight?: boolean;
+  style?: ViewStyle;
+  labelStyle?: TextStyle;
+  valueStyle?: TextStyle;
 }
 
 export const DetailRow: React.FC<DetailRowProps> = ({
   label,
   value,
   highlight = false,
+  style,
+  labelStyle,
+  valueStyle,
 }) => {
   const tokens = useAppDesignTokens();
 
   return (
-    <View style={styles.container}>
-      <AtomicText type="bodyMedium" style={{ color: tokens.colors.textSecondary }}>
+    <View style={[styles.container, style]}>
+      <AtomicText 
+        type="bodyMedium" 
+        style={[{ color: tokens.colors.textSecondary }, labelStyle]}
+      >
         {label}
       </AtomicText>
       <AtomicText
         type="bodyMedium"
-        style={{
-          color: highlight ? tokens.colors.warning : tokens.colors.text,
-          fontWeight: "500",
-        }}
+        style={[
+          {
+            color: highlight ? tokens.colors.warning : tokens.colors.textPrimary,
+            fontWeight: "500",
+          },
+          valueStyle,
+        ]}
       >
         {value}
       </AtomicText>

package/src/presentation/hooks/useSubscription.ts

@@ -48,98 +48,60 @@ export function useSubscription(): UseSubscriptionResult {
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
 
-  const loadStatus = useCallback(async (userId: string) => {
-    const validationError = validateUserId(userId);
-    if (validationError) {
-      setError(validationError);
+  const performOperation = useCallback(async (
+    userId: string,
+    operation: () => Promise<SubscriptionStatus | null | void>
+  ) => {
+    const errorMsg = validateUserId(userId);
+    if (errorMsg) {
+      setError(errorMsg);
       return;
     }
 
-    const serviceCheck = checkSubscriptionService();
-    if (!serviceCheck.success) {
-      setError(serviceCheck.error || "Service error");
+    const check = checkSubscriptionService();
+    if (!check.success) {
+      setError(check.error || "Service error");
       return;
     }
 
     await executeSubscriptionOperation(
-      () => serviceCheck.service!.getSubscriptionStatus(userId),
+      operation,
       setLoading,
       setError,
-      (result) => setStatus(result)
+      (result) => { if (result) setStatus(result as SubscriptionStatus); }
     );
   }, []);
 
-  const refreshStatus = useCallback(async (userId: string) => {
-    const validationError = validateUserId(userId);
-    if (validationError) {
-      setError(validationError);
-      return;
-    }
+  const loadStatus = useCallback((userId: string) => 
+    performOperation(userId, () => {
+      const { service } = checkSubscriptionService();
+       
+      return service!.getSubscriptionStatus(userId);
+    }), [performOperation]);
 
-    const serviceCheck = checkSubscriptionService();
-    if (!serviceCheck.success) {
-      setError(serviceCheck.error || "Service error");
-      return;
-    }
-
-    await executeSubscriptionOperation(
-      () => serviceCheck.service!.getSubscriptionStatus(userId),
-      setLoading,
-      setError,
-      (result) => setStatus(result)
-    );
-  }, []);
+  const refreshStatus = loadStatus;
 
   const activateSubscription = useCallback(
-    async (userId: string, productId: string, expiresAt: string | null) => {
-      const validationError = validateUserId(userId);
-      if (validationError) {
-        setError(validationError);
-        return;
-      }
-
+    (userId: string, productId: string, expiresAt: string | null) => {
       if (!productId) {
         setError("Product ID is required");
-        return;
+        return Promise.resolve();
       }
-
-      const serviceCheck = checkSubscriptionService();
-      if (!serviceCheck.success) {
-        setError(serviceCheck.error || "Service error");
-        return;
-      }
-
-      await executeSubscriptionOperation(
-        () =>
-          serviceCheck.service!.activateSubscription(userId, productId, expiresAt),
-        setLoading,
-        setError,
-        (result) => setStatus(result)
-      );
+      return performOperation(userId, () => {
+        const { service } = checkSubscriptionService();
+         
+        return service!.activateSubscription(userId, productId, expiresAt).then(res => res ?? undefined);
+      });
     },
-    []
+    [performOperation]
   );
 
-  const deactivateSubscription = useCallback(async (userId: string) => {
-    const validationError = validateUserId(userId);
-    if (validationError) {
-      setError(validationError);
-      return;
-    }
-
-    const serviceCheck = checkSubscriptionService();
-    if (!serviceCheck.success) {
-      setError(serviceCheck.error || "Service error");
-      return;
-    }
-
-    await executeSubscriptionOperation(
-      () => serviceCheck.service!.deactivateSubscription(userId),
-      setLoading,
-      setError,
-      (result) => setStatus(result)
-    );
-  }, []);
+  const deactivateSubscription = useCallback((userId: string) => 
+    performOperation(userId, () => {
+        const { service } = checkSubscriptionService();
+         
+        return service!.deactivateSubscription(userId).then(res => res ?? undefined);
+    }), [performOperation]);
 
   const isPremium = isSubscriptionValid(status);
 

package/src/presentation/hooks/useSubscriptionDetails.ts

@@ -1,14 +1,7 @@
-/**
- * useSubscriptionDetails Hook
- * Provides formatted subscription details for display
- */
-
 import { useMemo } from "react";
 import type { SubscriptionStatus } from "../../domain/entities/SubscriptionStatus";
-import {
-    getDaysUntilExpiration,
-    isSubscriptionExpired,
-} from "../../utils/dateValidationUtils";
+import { isSubscriptionExpired } from "../../utils/dateValidationUtils";
+import { formatDateForLocale, calculateDaysRemaining } from "../utils/subscriptionDateUtils";
 
 export interface SubscriptionDetails {
   /** Raw subscription status */
@@ -34,24 +27,6 @@ interface UseSubscriptionDetailsParams {
   locale?: string;
 }
 
-/**
- * Format date to localized string
- */
-function formatDate(dateString: string | null, locale: string): string | null {
-  if (!dateString) return null;
-
-  try {
-    const date = new Date(dateString);
-    return date.toLocaleDateString(locale, {
-      year: "numeric",
-      month: "long",
-      day: "numeric",
-    });
-  } catch {
-    return null;
-  }
-}
-
 /**
  * Hook for formatted subscription details
  */
@@ -76,7 +51,7 @@ export function useSubscriptionDetails(
 
     const isExpired = isSubscriptionExpired(status);
     const isLifetime = status.isPremium && !status.expiresAt;
-    const daysRemaining = getDaysUntilExpiration(status);
+    const daysRemainingValue = calculateDaysRemaining(status.expiresAt ?? null);
     const isPremium = status.isPremium && !isExpired;
 
     let statusKey: "active" | "expired" | "none" = "none";
@@ -89,10 +64,11 @@ export function useSubscriptionDetails(
       isPremium,
       isExpired,
       isLifetime,
-      daysRemaining,
-      formattedExpirationDate: formatDate(status.expiresAt ?? null, locale),
-      formattedPurchaseDate: formatDate(status.purchasedAt ?? null, locale),
+      daysRemaining: daysRemainingValue,
+      formattedExpirationDate: formatDateForLocale(status.expiresAt ?? null, locale),
+      formattedPurchaseDate: formatDateForLocale(status.purchasedAt ?? null, locale),
       statusKey,
     };
   }, [status, locale]);
 }
+

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

@@ -6,7 +6,7 @@
 import React, { useMemo } from "react";
 import { View, StyleSheet } from "react-native";
 import { useAppDesignTokens, AtomicText } from "@umituz/react-native-design-system";
-import { CreditItem } from "./CreditItem";
+import { CreditRow } from "../../components/details/CreditRow";
 import type { CreditsListProps } from "../../types/SubscriptionDetailTypes";
 
 export const CreditsList: React.FC<CreditsListProps> = ({
@@ -59,7 +59,7 @@ export const CreditsList: React.FC<CreditsListProps> = ({
       )}
       <View style={styles.list}>
         {credits.map((credit) => (
-          <CreditItem
+          <CreditRow
             key={credit.id}
             label={credit.label}
             current={credit.current}

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

@@ -7,6 +7,7 @@ import React, { useMemo } from "react";
 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 const SubscriptionHeader: React.FC<SubscriptionHeaderProps> = ({
@@ -90,8 +91,9 @@ export const SubscriptionHeader: React.FC<SubscriptionHeaderProps> = ({
             <DetailRow
               label={translations.statusLabel}
               value={translations.lifetimeLabel}
-              tokens={tokens}
-              styles={styles}
+              style={styles.row}
+              labelStyle={styles.label}
+              valueStyle={styles.value}
             />
           ) : (
             <>
@@ -100,16 +102,18 @@ export const SubscriptionHeader: React.FC<SubscriptionHeaderProps> = ({
                   label={translations.expiresLabel}
                   value={expirationDate}
                   highlight={showExpiring}
-                  tokens={tokens}
-                  styles={styles}
+                  style={styles.row}
+                  labelStyle={styles.label}
+                  valueStyle={styles.value}
                 />
               )}
               {purchaseDate && (
                 <DetailRow
                   label={translations.purchasedLabel}
                   value={purchaseDate}
-                  tokens={tokens}
-                  styles={styles}
+                  style={styles.row}
+                  labelStyle={styles.label}
+                  valueStyle={styles.value}
                 />
               )}
             </>
@@ -119,41 +123,3 @@ export const SubscriptionHeader: React.FC<SubscriptionHeaderProps> = ({
     </View>
   );
 };
-
-interface DetailRowProps {
-  label: string;
-  value: string;
-  highlight?: boolean;
-  tokens: ReturnType<typeof useAppDesignTokens>;
-  styles: {
-    row: object;
-    label: object;
-    value: object;
-  };
-}
-
-const DetailRow: React.FC<DetailRowProps> = ({
-  label,
-  value,
-  highlight,
-  tokens,
-  styles,
-}) => (
-  <View style={styles.row}>
-    <AtomicText
-      type="bodyMedium"
-      style={[styles.label, { color: tokens.colors.textSecondary }]}
-    >
-      {label}
-    </AtomicText>
-    <AtomicText
-      type="bodyMedium"
-      style={[
-        styles.value,
-        { color: highlight ? tokens.colors.warning : tokens.colors.textPrimary },
-      ]}
-    >
-      {value}
-    </AtomicText>
-  </View>
-);

package/src/presentation/types/SubscriptionDetailTypes.ts

@@ -105,8 +105,8 @@ export interface CreditsListProps {
   remainingLabel?: string;
 }
 
-/** Props for credit item component */
-export interface CreditItemProps {
+/** Props for credit row component */
+export interface CreditRowProps {
   label: string;
   current: number;
   total: number;

package/src/revenuecat/infrastructure/services/RevenueCatInitializer.ts

@@ -45,6 +45,16 @@ function configureLogHandler(): void {
     isLogHandlerConfigured = true;
 }
 
+function buildSuccessResult(
+    deps: InitializerDeps,
+    customerInfo: any,
+    offerings: any
+): InitializeResult {
+    const entitlementId = deps.config.entitlementIdentifier;
+    const hasPremium = !!customerInfo.entitlements.active[entitlementId];
+    return { success: true, offering: offerings.current, hasPremium };
+}
+
 export async function initializeSDK(
     deps: InitializerDeps,
     userId: string,
@@ -57,9 +67,7 @@ export async function initializeSDK(
                 Purchases.getCustomerInfo(),
                 Purchases.getOfferings(),
             ]);
-            const entitlementId = deps.config.entitlementIdentifier;
-            const hasPremium = !!customerInfo.entitlements.active[entitlementId];
-            return { success: true, offering: offerings.current, hasPremium };
+            return buildSuccessResult(deps, customerInfo, offerings);
         } catch {
             return { success: false, offering: null, hasPremium: false };
         }
@@ -82,10 +90,7 @@ export async function initializeSDK(
             deps.setCurrentUserId(userId);
 
             const offerings = await Purchases.getOfferings();
-            const entitlementId = deps.config.entitlementIdentifier;
-            const hasPremium = !!customerInfo.entitlements.active[entitlementId];
-
-            return { success: true, offering: offerings.current, hasPremium };
+            return buildSuccessResult(deps, customerInfo, offerings);
         } catch {
             return { success: false, offering: null, hasPremium: false };
         }
@@ -114,10 +119,7 @@ export async function initializeSDK(
             Purchases.getOfferings(),
         ]);
 
-        const entitlementId = deps.config.entitlementIdentifier;
-        const hasPremium = !!customerInfo.entitlements.active[entitlementId];
-
-        return { success: true, offering: offerings.current, hasPremium };
+        return buildSuccessResult(deps, customerInfo, offerings);
     } catch (error) {
         getErrorMessage(error, "RevenueCat init failed");
         return { success: false, offering: null, hasPremium: false };

package/src/revenuecat/infrastructure/services/RevenueCatService.ts

@@ -51,6 +51,17 @@ export class RevenueCatService implements IRevenueCatService {
         return this.stateManager.getCurrentUserId();
     }
 
+    private getSDKParams() {
+        return {
+            config: this.stateManager.getConfig(),
+            isUsingTestStore: () => this.isUsingTestStore(),
+            isInitialized: () => this.isInitialized(),
+            getCurrentUserId: () => this.stateManager.getCurrentUserId(),
+            setInitialized: (value: boolean) => this.stateManager.setInitialized(value),
+            setCurrentUserId: (id: string | null) => this.stateManager.setCurrentUserId(id),
+        };
+    }
+
     async initialize(userId: string, apiKey?: string): Promise<InitializeResult> {
         if (this.isInitialized() && this.getCurrentUserId() === userId) {
             return {
@@ -60,18 +71,7 @@ export class RevenueCatService implements IRevenueCatService {
             };
         }
 
-        const result = await initializeSDK(
-            {
-                config: this.stateManager.getConfig(),
-                isUsingTestStore: () => this.isUsingTestStore(),
-                isInitialized: () => this.isInitialized(),
-                getCurrentUserId: () => this.stateManager.getCurrentUserId(),
-                setInitialized: (value) => this.stateManager.setInitialized(value),
-                setCurrentUserId: (id) => this.stateManager.setCurrentUserId(id),
-            },
-            userId,
-            apiKey
-        );
+        const result = await initializeSDK(this.getSDKParams(), userId, apiKey);
 
         if (result.success) {
             this.listenerManager.setUserId(userId);
@@ -82,36 +82,18 @@ export class RevenueCatService implements IRevenueCatService {
     }
 
     async fetchOfferings(): Promise<PurchasesOffering | null> {
-        return fetchOfferings({
-            isInitialized: () => this.isInitialized(),
-            isUsingTestStore: () => this.isUsingTestStore(),
-        });
+        return fetchOfferings(this.getSDKParams());
     }
 
     async purchasePackage(
         pkg: PurchasesPackage,
         userId: string
     ): Promise<PurchaseResult> {
-        return handlePurchase(
-            {
-                config: this.stateManager.getConfig(),
-                isInitialized: () => this.isInitialized(),
-                isUsingTestStore: () => this.isUsingTestStore(),
-            },
-            pkg,
-            userId
-        );
+        return handlePurchase(this.getSDKParams(), pkg, userId);
     }
 
     async restorePurchases(userId: string): Promise<RestoreResult> {
-        return handleRestore(
-            {
-                config: this.stateManager.getConfig(),
-                isInitialized: () => this.isInitialized(),
-                isUsingTestStore: () => this.isUsingTestStore(),
-            },
-            userId
-        );
+        return handleRestore(this.getSDKParams(), userId);
     }
 
     async getCustomerInfo(): Promise<CustomerInfo | null> {

package/src/revenuecat/infrastructure/services/ServiceStateManager.ts

@@ -33,7 +33,7 @@ export class ServiceStateManager {
     return this.isInitializedFlag;
   }
 
-  setCurrentUserId(userId: string): void {
+  setCurrentUserId(userId: string | null): void {
     this.currentUserId = userId;
   }
 

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

@@ -1,95 +0,0 @@
-/**
- * Credit Item Component
- * Displays individual credit usage with progress bar
- */
-
-import React, { useMemo } from "react";
-import { View, StyleSheet } from "react-native";
-import { useAppDesignTokens, AtomicText } from "@umituz/react-native-design-system";
-import type { CreditItemProps } from "../../types/SubscriptionDetailTypes";
-
-export const CreditItem: React.FC<CreditItemProps> = ({
-  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 progressColor = useMemo(() => {
-    if (isLow) return tokens.colors.error;
-    if (isMedium) return tokens.colors.warning;
-    return tokens.colors.success;
-  }, [isLow, isMedium, tokens.colors]);
-
-  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.radius.md,
-          backgroundColor: tokens.colors.surfaceSecondary,
-        },
-        count: {
-          fontWeight: "600",
-        },
-        progressBar: {
-          height: 8,
-          borderRadius: tokens.radius.xs,
-          overflow: "hidden",
-          backgroundColor: tokens.colors.surfaceSecondary,
-        },
-        progressFill: {
-          height: "100%",
-          borderRadius: tokens.radius.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}>
-          <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>
-  );
-};