@umituz/react-native-subscription 2.14.86 → 2.14.87

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.14.86",
+  "version": "2.14.87",
   "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/presentation/components/details/CreditRow.tsx

@@ -18,7 +18,7 @@ export const CreditRow: React.FC<CreditRowProps> = ({
   label,
   current,
   total,
-  remainingLabel = "remaining",
+  remainingLabel,
 }) => {
   const tokens = useAppDesignTokens();
   const percentage = total > 0 ? (current / total) * 100 : 0;
@@ -27,7 +27,7 @@ export const CreditRow: React.FC<CreditRowProps> = ({
   return (
     <View style={styles.container}>
       <View style={styles.header}>
-        <AtomicText type="bodySmall" style={{ color: tokens.colors.text }}>
+        <AtomicText type="bodySmall" style={{ color: tokens.colors.textPrimary }}>
           {label}
         </AtomicText>
         <AtomicText

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/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/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;
   }