@umituz/react-native-subscription 2.39.8 → 2.39.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.39.8",
+  "version": "2.39.10",
   "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/credits/application/CreditLimitCalculator.ts

@@ -1,21 +1,10 @@
 import type { CreditsConfig } from "../core/Credits";
-import { detectPackageType } from "../../../utils/packageTypeDetector";
-import { getCreditAllocation } from "../../../utils/creditMapper";
+import { calculateCreditLimit as calculateLimit } from "../utils/creditCalculations";
 
+/**
+ * Service to calculate credit limits based on product configuration.
+ * Uses centralized utility functions for calculations.
+ */
 export function calculateCreditLimit(productId: string | undefined, config: CreditsConfig): number {
-  if (!productId) {
-    throw new Error("[CreditLimitCalculator] Cannot calculate credit limit without productId");
-  }
-
-  const explicitAmount = config.creditPackageAmounts?.[productId];
-  if (explicitAmount !== undefined && explicitAmount !== null) return explicitAmount;
-
-  const packageType = detectPackageType(productId);
-  const dynamicLimit = getCreditAllocation(packageType, config.packageAllocations);
-
-  if (dynamicLimit === null || dynamicLimit === undefined) {
-    throw new Error(`[CreditLimitCalculator] Cannot determine credit limit for productId: ${productId}, packageType: ${packageType}`);
-  }
-
-  return dynamicLimit;
+  return calculateLimit(productId, config);
 }

package/src/domains/credits/core/UserCreditsDocument.ts

@@ -5,7 +5,7 @@ import type {
   PackageType,
   Platform
 } from "../../subscription/core/SubscriptionConstants";
-import type { Store, OwnershipType } from "../../revenuecat/core/types";
+import type { Store, OwnershipType } from "../../revenuecat/core/types/RevenueCatTypes";
 
 export type {
   PurchaseSource,

package/src/domains/credits/infrastructure/CreditsRepository.ts

@@ -2,14 +2,14 @@ import type { Firestore, DocumentReference } from "@umituz/react-native-firebase
 import { BaseRepository } from "@umituz/react-native-firebase";
 import type { CreditsConfig, CreditsResult, DeductCreditsResult } from "../core/Credits";
 import type { PurchaseSource } from "../core/UserCreditsDocument";
-import type { RevenueCatData } from "../../revenuecat/core/types";
+import type { RevenueCatData } from "../../revenuecat/core/types/RevenueCatData";
 import { deductCreditsOperation } from "../application/DeductCreditsCommand";
 import { refundCreditsOperation } from "../application/RefundCreditsCommand";
 import { PURCHASE_TYPE, type PurchaseType } from "../../subscription/core/SubscriptionConstants";
-import { requireFirestore, buildDocRef, type CollectionConfig } from "../../../shared/infrastructure/firestore";
+import { requireFirestore, buildDocRef, type CollectionConfig } from "../../../shared/infrastructure/firestore/collectionUtils";
 import { fetchCredits, checkHasCredits, documentExists } from "./operations/CreditsFetcher";
 import { syncExpiredStatus, syncPremiumMetadata, createRecoveryCreditsDocument } from "./operations/CreditsWriter";
-import type { SubscriptionMetadata } from "../../subscription/core/types";
+import type { SubscriptionMetadata } from "../../subscription/core/types/SubscriptionMetadata";
 import { initializeCreditsWithRetry } from "./operations/CreditsInitializer";
 import { calculateCreditLimit } from "../application/CreditLimitCalculator";
 

package/src/domains/credits/infrastructure/operations/CreditsInitializer.ts

@@ -3,7 +3,7 @@ import type { CreditsConfig, CreditsResult } from "../../core/Credits";
 import type { PurchaseSource } from "../../core/UserCreditsDocument";
 import { initializeCreditsTransaction } from "../../application/CreditsInitializer";
 import { mapCreditsDocumentToEntity } from "../../core/CreditsMapper";
-import type { RevenueCatData } from "../../../revenuecat/core/types";
+import type { RevenueCatData } from "../../../revenuecat/core/types/RevenueCatData";
 import { calculateCreditLimit } from "../../application/CreditLimitCalculator";
 import { PURCHASE_TYPE, type PurchaseType } from "../../../subscription/core/SubscriptionConstants";
 

package/src/domains/credits/infrastructure/operations/CreditsWriter.ts

@@ -3,7 +3,7 @@ import { runTransaction, serverTimestamp } from "@umituz/react-native-firebase";
 import { doc, getDoc, setDoc } from "firebase/firestore";
 import { SUBSCRIPTION_STATUS } from "../../../subscription/core/SubscriptionConstants";
 import { resolveSubscriptionStatus } from "../../../subscription/core/SubscriptionStatus";
-import type { SubscriptionMetadata } from "../../../subscription/core/types";
+import type { SubscriptionMetadata } from "../../../subscription/core/types/SubscriptionMetadata";
 import { toTimestamp } from "../../../../shared/utils/dateConverter";
 import { isPast } from "../../../../utils/dateUtils";
 import { getAppVersion, validatePlatform } from "../../../../utils/appUtils";

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

@@ -10,7 +10,7 @@ export const PaywallFeatures: React.FC<{ features: SubscriptionFeature[] }> = ({
   if (!features.length) return null;
 
   return (
-    <View style={[styles.features, { backgroundColor: tokens.colors.surfaceSecondary }]}>
+    <View style={[styles.featuresContainer, { backgroundColor: tokens.colors.surfaceSecondary }]}>
       {features.map((feature) => (
         <View key={`${feature.icon}-${feature.text}`} style={styles.featureRow}>
           <View style={[styles.featureIcon, { backgroundColor: tokens.colors.primary }]}>

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

@@ -25,7 +25,7 @@ export const PaywallFooter: React.FC<PaywallFooterProps> = ({
   return (
     <View style={styles.footer}>
       {onRestore && (
-        <TouchableOpacity onPress={onRestore} disabled={isProcessing} style={[styles.restoreButton, isProcessing && styles.restoreButtonDisabled]}>
+        <TouchableOpacity onPress={onRestore} disabled={isProcessing} style={[styles.restoreButton, isProcessing && styles.ctaDisabled]}>
           <AtomicText type="bodySmall" style={[styles.footerLink, { color: tokens.colors.textSecondary }]}>
             {isProcessing ? translations.processingText : translations.restoreButtonText}
           </AtomicText>

package/src/domains/paywall/components/PaywallScreen.styles.ts

@@ -1,97 +1,169 @@
-import { StyleSheet } from "react-native";
+import { StyleSheet, Platform } from "react-native";
 
 export const paywallScreenStyles = StyleSheet.create({
   container: {
     flex: 1,
   },
+  // Header / Hero
   heroContainer: {
     alignItems: "center",
-    marginBottom: 24,
+    justifyContent: "center",
+    marginVertical: 24,
+    height: 140,
   },
   heroImage: {
     width: 120,
     height: 120,
-    borderRadius: 60,
+    borderRadius: 30, // More modern rounded corners
   },
   header: {
     paddingHorizontal: 24,
-    marginBottom: 24,
+    marginBottom: 32,
+    alignItems: "center",
   },
   title: {
-    marginBottom: 8,
+    marginBottom: 12,
+    textAlign: "center",
+    fontWeight: "800",
+    letterSpacing: -0.5,
   },
   subtitle: {
     lineHeight: 22,
+    textAlign: "center",
+    opacity: 0.8,
+    paddingHorizontal: 12,
   },
-  plans: {
-    paddingHorizontal: 16,
+
+  // Sections
+  sectionHeader: {
+    paddingHorizontal: 24,
+    marginTop: 24,
     marginBottom: 16,
   },
-  loading: {
+  sectionTitle: {
+    fontWeight: "700",
+    textTransform: "uppercase",
+    letterSpacing: 1,
+    fontSize: 13,
+    opacity: 0.6,
+  },
+
+  // Features
+  featuresContainer: {
+    marginHorizontal: 24,
+    padding: 20,
+    borderRadius: 24,
+    gap: 16,
+    borderWidth: 1,
+    borderColor: "rgba(255, 255, 255, 0.1)",
+  },
+  featureRow: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: 14,
+  },
+  featureIcon: {
+    width: 30,
+    height: 30,
+    borderRadius: 10,
+    justifyContent: "center",
     alignItems: "center",
-    paddingVertical: 32,
+    shadowColor: "#000",
+    shadowOffset: { width: 0, height: 2 },
+    shadowOpacity: 0.2,
+    shadowRadius: 4,
+    elevation: 3,
   },
-  loadingText: {
-    marginTop: 12,
+  featureText: {
+    flex: 1,
+    fontWeight: "500",
+    fontSize: 15,
   },
+
+  // Fixed Footer
   stickyFooter: {
     position: "absolute",
     bottom: 0,
     left: 0,
     right: 0,
-    paddingHorizontal: 16,
-    paddingTop: 12,
+    paddingHorizontal: 24,
+    paddingTop: 20,
     borderTopWidth: 1,
-    borderTopColor: "rgba(255, 255, 255, 0.1)",
+    borderTopColor: "rgba(255, 255, 255, 0.08)",
+    ...Platform.select({
+      ios: {
+        shadowColor: "#000",
+        shadowOffset: { width: 0, height: -4 },
+        shadowOpacity: 0.1,
+        shadowRadius: 12,
+      },
+      android: {
+        elevation: 8,
+      },
+    }),
   },
   cta: {
-    borderRadius: 14,
-    paddingVertical: 16,
+    borderRadius: 18,
+    height: 60,
+    justifyContent: "center",
     alignItems: "center",
+    shadowColor: "#000",
+    shadowOffset: { width: 0, height: 4 },
+    shadowOpacity: 0.3,
+    shadowRadius: 8,
+    elevation: 6,
   },
   ctaDisabled: {
-    opacity: 0.6,
+    opacity: 0.5,
   },
   ctaText: {
-    fontWeight: "600",
-  },
-  features: {
-    padding: 16,
-  },
-  featureRow: {
-    flexDirection: "row",
-    alignItems: "center",
-    marginBottom: 12,
-  },
-  featureIcon: {
-    width: 32,
-    height: 32,
-    borderRadius: 16,
-    alignItems: "center",
-    justifyContent: "center",
-    marginRight: 12,
-  },
-  featureText: {
-    flex: 1,
+    fontWeight: "700",
+    letterSpacing: 0.5,
   },
+
+  // Footer Links
   footer: {
-    paddingHorizontal: 16,
-    paddingBottom: 16,
+    marginTop: 16,
+    alignItems: "center",
+    gap: 12,
   },
   restoreButton: {
-    paddingVertical: 8,
-  },
-  restoreButtonDisabled: {
-    opacity: 0.5,
+    paddingVertical: 4,
   },
   footerLink: {
     fontSize: 12,
+    fontWeight: "500",
+    textDecorationLine: "underline",
+    opacity: 0.7,
   },
   legalRow: {
     flexDirection: "row",
     justifyContent: "center",
     alignItems: "center",
+    gap: 20,
+    marginBottom: 8,
+  },
+
+  // Close Button
+  closeBtn: {
+    width: 40,
+    height: 40,
+    borderRadius: 20,
+    justifyContent: "center",
+    alignItems: "center",
+    marginRight: 16,
     marginTop: 8,
-    gap: 16,
+    borderWidth: 1,
+    borderColor: "rgba(255, 255, 255, 0.1)",
+  },
+  
+  // List
+  listContent: {
+    paddingBottom: 40,
+  },
+  loadingContainer: {
+    flex: 1,
+    justifyContent: "center",
+    alignItems: "center",
   },
 });