@umituz/react-native-subscription 2.35.6 → 2.35.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.35.6",
+  "version": "2.35.8",
   "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/subscription/{presentation/featureGateHelpers.ts → application/featureGate/featureGateBusinessRules.ts}

@@ -1,31 +1,31 @@
 export const DEFAULT_REQUIRED_CREDITS = 1;
 
-export const shouldExecuteAuthAction = (
+export function canExecuteAuthAction(
   isWaitingForAuthCredits: boolean,
   isCreditsLoaded: boolean,
   hasPendingAction: boolean,
   hasSubscription: boolean,
   creditBalance: number,
   requiredCredits: number
-): boolean => {
+): boolean {
   if (!isWaitingForAuthCredits || !isCreditsLoaded || !hasPendingAction) {
     return false;
   }
   return hasSubscription || creditBalance >= requiredCredits;
-};
+}
 
-export const shouldExecutePurchaseAction = (
+export function canExecutePurchaseAction(
   isWaitingForPurchase: boolean,
   creditBalance: number,
   prevBalance: number,
   hasSubscription: boolean,
   prevHasSubscription: boolean,
   hasPendingAction: boolean
-): boolean => {
+): boolean {
   if (!isWaitingForPurchase || !hasPendingAction) {
     return false;
   }
   const creditsIncreased = creditBalance > prevBalance;
   const subscriptionAcquired = hasSubscription && !prevHasSubscription;
   return creditsIncreased || subscriptionAcquired;
-};
+}

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

@@ -7,7 +7,7 @@ import { styles } from "./PremiumDetailsCard.styles";
 import type { PremiumDetailsCardProps } from "./PremiumDetailsCardTypes";
 import { PremiumDetailsCardHeader } from "./PremiumDetailsCardHeader";
 import { PremiumDetailsCardActions } from "./PremiumDetailsCardActions";
-import { shouldHighlightExpiration } from "./premiumDetailsHelpers";
+import { shouldHighlightExpiration } from "../../../../subscription/utils/expirationHelpers";
 
 export type { CreditInfo, PremiumDetailsTranslations, PremiumDetailsCardProps } from "./PremiumDetailsCardTypes";
 

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

@@ -2,22 +2,10 @@ import React from "react";
 import { View } from "react-native";
 import { DetailRow } from "../../components/details/DetailRow";
 import type { SubscriptionHeaderProps } from "./SubscriptionHeader.types";
+import { formatPackageTypeForDisplay } from "../../../../subscription/utils/packageTypeFormatter";
 
 declare const __DEV__: boolean;
 
-function formatSubscriptionPeriod(packageType: string | null | undefined, periodType: string | null | undefined): string {
-  if (packageType) {
-    const formatted = packageType.toLowerCase().replace(/_/g, ' ');
-    return formatted.charAt(0).toUpperCase() + formatted.slice(1);
-  }
-
-  if (periodType === "NORMAL") {
-    return "Standard";
-  }
-
-  return periodType || "Unknown";
-}
-
 interface SubscriptionHeaderContentProps {
   isLifetime: boolean;
   showExpirationDate: boolean;
@@ -93,10 +81,10 @@ export const SubscriptionHeaderContent: React.FC<SubscriptionHeaderContentProps>
             valueStyle={styles.value}
           />
         )}
-        {(packageType || periodType) && translations.periodTypeLabel && (
+        {packageType && translations.periodTypeLabel && (
           <DetailRow
             label={translations.periodTypeLabel}
-            value={formatSubscriptionPeriod(packageType, periodType)}
+            value={formatPackageTypeForDisplay(packageType)}
             style={styles.row}
             labelStyle={styles.label}
             valueStyle={styles.value}

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

@@ -1,6 +1,6 @@
 import { useCallback, useRef, useEffect } from "react";
 import type { UseFeatureGateParams, UseFeatureGateResult } from "./useFeatureGate.types";
-import { DEFAULT_REQUIRED_CREDITS, shouldExecuteAuthAction, shouldExecutePurchaseAction } from "./featureGateHelpers";
+import { DEFAULT_REQUIRED_CREDITS, canExecuteAuthAction, canExecutePurchaseAction } from "../application/featureGate/featureGateBusinessRules";
 import { useSyncedRefs } from "./featureGateRefs";
 import { executeFeatureAction } from "./featureGateActions";
 
@@ -38,7 +38,7 @@ export function useFeatureGate(params: UseFeatureGateParams): UseFeatureGateResu
       });
     }
 
-    const shouldExecute = shouldExecuteAuthAction(
+    const shouldExecute = canExecuteAuthAction(
       isWaitingForAuthCreditsRef.current,
       isCreditsLoaded,
       !!pendingActionRef.current,
@@ -48,7 +48,7 @@ export function useFeatureGate(params: UseFeatureGateParams): UseFeatureGateResu
     );
 
     if (typeof __DEV__ !== "undefined" && __DEV__) {
-      console.log("[FeatureGate] shouldExecuteAuthAction:", shouldExecute);
+      console.log("[FeatureGate] canExecuteAuthAction:", shouldExecute);
     }
 
     if (shouldExecute) {
@@ -84,7 +84,7 @@ export function useFeatureGate(params: UseFeatureGateParams): UseFeatureGateResu
       });
     }
 
-    const shouldExecute = shouldExecutePurchaseAction(
+    const shouldExecute = canExecutePurchaseAction(
       isWaitingForPurchaseRef.current,
       creditBalance,
       prevCreditBalanceRef.current ?? 0,
@@ -94,7 +94,7 @@ export function useFeatureGate(params: UseFeatureGateParams): UseFeatureGateResu
     );
 
     if (typeof __DEV__ !== "undefined" && __DEV__) {
-      console.log("[FeatureGate] shouldExecutePurchaseAction:", shouldExecute);
+      console.log("[FeatureGate] canExecutePurchaseAction:", shouldExecute);
     }
 
     if (shouldExecute) {

package/src/domains/subscription/utils/dateFormatters.ts

@@ -0,0 +1,28 @@
+import { timezoneService } from "@umituz/react-native-design-system";
+
+export function convertFirestoreTimestampToISO(timestamp: unknown): string | null {
+  if (!timestamp) return null;
+
+  let date: Date;
+  if (
+    typeof timestamp === "object" &&
+    timestamp !== null &&
+    "toDate" in timestamp
+  ) {
+    date = (timestamp as { toDate: () => Date }).toDate();
+  } else if (timestamp instanceof Date) {
+    date = timestamp;
+  } else {
+    return null;
+  }
+
+  return timezoneService.formatToISOString(date);
+}
+
+export function formatDateForDisplay(dateStr: string | null): string | null {
+  if (!dateStr) return null;
+  const date = new Date(dateStr);
+  if (isNaN(date.getTime())) return null;
+
+  return timezoneService.formatToDisplayDate(date);
+}

package/src/domains/subscription/utils/expirationHelpers.ts

@@ -0,0 +1,5 @@
+const DAYS_REMAINING_WARNING_THRESHOLD = 7;
+
+export function shouldHighlightExpiration(daysRemaining: number | null | undefined): boolean {
+  return daysRemaining !== null && daysRemaining !== undefined && daysRemaining > 0 && daysRemaining <= DAYS_REMAINING_WARNING_THRESHOLD;
+}

package/src/domains/subscription/utils/packageTypeFormatter.ts

@@ -0,0 +1,10 @@
+import type { PackageType } from "../../revenuecat/core/types";
+
+export function formatPackageTypeForDisplay(packageType: PackageType | string | null | undefined): string {
+  if (!packageType) {
+    return "";
+  }
+
+  const formatted = packageType.toLowerCase().replace(/_/g, " ");
+  return formatted.charAt(0).toUpperCase() + formatted.slice(1);
+}

package/src/domains/subscription/presentation/components/details/premiumDetailsHelpers.ts

@@ -1,5 +0,0 @@
-import { DAYS_REMAINING_WARNING_THRESHOLD } from "./PremiumDetailsCard.constants";
-
-export const shouldHighlightExpiration = (daysRemaining: number | null | undefined): boolean => {
-  return daysRemaining !== null && daysRemaining !== undefined && daysRemaining > 0 && daysRemaining <= DAYS_REMAINING_WARNING_THRESHOLD;
-};

package/src/domains/subscription/presentation/utils/subscriptionDateUtils.ts

@@ -1,36 +0,0 @@
-import { timezoneService } from "@umituz/react-native-design-system";
-
-/**
- * Converts Firestore timestamp or Date to ISO string
- */
-export const convertPurchasedAt = (purchasedAt: unknown): string | null => {
-  if (!purchasedAt) return null;
-
-  let date: Date;
-  if (
-    typeof purchasedAt === "object" &&
-    purchasedAt !== null &&
-    "toDate" in purchasedAt
-  ) {
-    date = (purchasedAt as { toDate: () => Date }).toDate();
-  } else if (purchasedAt instanceof Date) {
-    date = purchasedAt;
-  } else {
-    return null;
-  }
-
-  return timezoneService.formatToISOString(date);
-};
-
-/**
- * Formats a date string to a simple DD.MM.YYYY format using timezoneService
- */
-export const formatDate = (dateStr: string | null): string | null => {
-  if (!dateStr) return null;
-  const date = new Date(dateStr);
-  if (isNaN(date.getTime())) return null;
-  
-  return timezoneService.formatToDisplayDate(date);
-};
-
-