@umituz/react-native-subscription 2.22.1 → 2.22.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.22.1",
+  "version": "2.22.3",
   "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/presentation/screens/SubscriptionDetailScreen.tsx

@@ -31,7 +31,7 @@ export const SubscriptionDetailScreen: React.FC<
   SubscriptionDetailScreenProps
 > = ({ config }) => {
   const tokens = useAppDesignTokens();
-  const showCredits = config.isPremium && config.credits && config.credits.length > 0;
+  const showCredits = config.credits && config.credits.length > 0;
   const showUpgradePrompt = !config.isPremium && config.upgradePrompt;
 
   const styles = useMemo(
@@ -68,8 +68,8 @@ export const SubscriptionDetailScreen: React.FC<
         ) : undefined
       }
     >
-      {config.isPremium ? (
-        <View style={styles.cardsContainer}>
+      <View style={styles.cardsContainer}>
+        {config.isPremium && (
           <SubscriptionHeader
             statusType={config.statusType}
             isPremium={config.isPremium}
@@ -79,20 +79,20 @@ export const SubscriptionDetailScreen: React.FC<
             daysRemaining={config.daysRemaining}
             translations={config.translations}
           />
+        )}
 
-          {showCredits && (
-            <CreditsList
-              credits={config.credits!}
-              title={
-                config.translations.usageTitle || config.translations.creditsTitle
-              }
-              description={config.translations.creditsResetInfo}
-              remainingLabel={config.translations.remainingLabel}
-            />
-          )}
-        </View>
-      ) : (
-        showUpgradePrompt && (
+        {showCredits && (
+          <CreditsList
+            credits={config.credits!}
+            title={
+              config.translations.usageTitle || config.translations.creditsTitle
+            }
+            description={config.translations.creditsResetInfo}
+            remainingLabel={config.translations.remainingLabel}
+          />
+        )}
+
+        {showUpgradePrompt && (
           <UpgradePrompt
             title={config.upgradePrompt!.title}
             subtitle={config.upgradePrompt!.subtitle}
@@ -100,8 +100,8 @@ export const SubscriptionDetailScreen: React.FC<
             upgradeButtonLabel={config.translations.upgradeButton}
             onUpgrade={config.onUpgrade}
           />
-        )
-      )}
+        )}
+      </View>
 
       <View style={styles.spacer} />
     </ScreenLayout>

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

@@ -1,13 +1,9 @@
 /**
  * Purchase Handler
  * Handles RevenueCat purchase operations for both subscriptions and consumables
- *
- * IMPORTANT: Uses race condition with CustomerInfo listener to handle
- * known RevenueCat bug where purchasePackage can hang indefinitely.
- * @see https://github.com/RevenueCat/react-native-purchases/issues/1082
  */
 
-import Purchases, { type PurchasesPackage, type CustomerInfo } from "react-native-purchases";
+import Purchases, { type PurchasesPackage } from "react-native-purchases";
 import type { PurchaseResult } from "../../application/ports/IRevenueCatService";
 import {
     RevenueCatPurchaseError,
@@ -24,50 +20,6 @@ import {
 } from "../utils/PremiumStatusSyncer";
 import { getSavedPurchase, clearSavedPurchase } from "../../../presentation/hooks/useAuthAwarePurchase";
 
-const PURCHASE_LISTENER_TIMEOUT_MS = 30000; // 30 seconds fallback timeout
-
-/**
- * Creates a promise that resolves when CustomerInfo listener detects premium
- * This is a workaround for RevenueCat bug where purchasePackage can hang
- */
-function createPremiumListenerPromise(
-    entitlementId: string
-): { promise: Promise<CustomerInfo>; cleanup: () => void } {
-    let cleanup: () => void = () => {};
-    let timeoutId: ReturnType<typeof setTimeout> | null = null;
-
-    const promise = new Promise<CustomerInfo>((resolve, reject) => {
-        const listener = (info: CustomerInfo) => {
-            const isPremium = !!info.entitlements.active[entitlementId];
-            if (isPremium) {
-                if (__DEV__) {
-                    console.log('[DEBUG PurchaseHandler] Listener detected premium!');
-                }
-                cleanup();
-                resolve(info);
-            }
-        };
-
-        Purchases.addCustomerInfoUpdateListener(listener);
-
-        // Fallback timeout - if neither purchasePackage nor listener resolves
-        timeoutId = setTimeout(() => {
-            cleanup();
-            reject(new Error('Purchase timed out. Please try again.'));
-        }, PURCHASE_LISTENER_TIMEOUT_MS);
-
-        cleanup = () => {
-            Purchases.removeCustomerInfoUpdateListener(listener);
-            if (timeoutId) {
-                clearTimeout(timeoutId);
-                timeoutId = null;
-            }
-        };
-    });
-
-    return { promise, cleanup };
-}
-
 export interface PurchaseHandlerDeps {
     config: RevenueCatConfig;
     isInitialized: () => boolean;
@@ -110,48 +62,18 @@ export async function handlePurchase(
 
     const consumableIds = deps.config.consumableProductIdentifiers || [];
     const isConsumable = isConsumableProduct(pkg, consumableIds);
-
-    // Set up listener-based detection as fallback for purchasePackage bug
     const entitlementIdentifier = deps.config.entitlementIdentifier;
-    const { promise: listenerPromise, cleanup: cleanupListener } = createPremiumListenerPromise(entitlementIdentifier);
 
     try {
         if (__DEV__) {
-            console.log('[DEBUG PurchaseHandler] Calling Purchases.purchasePackage with listener fallback...', {
+            console.log('[DEBUG PurchaseHandler] Calling Purchases.purchasePackage...', {
                 productId: pkg.product.identifier,
                 packageIdentifier: pkg.identifier,
                 offeringIdentifier: pkg.offeringIdentifier,
-                timestamp: new Date().toISOString()
             });
         }
 
-        const startTime = Date.now();
-
-        // Race between purchasePackage and listener detection
-        // This handles the known RevenueCat bug where purchasePackage can hang
-        const purchasePromise = Purchases.purchasePackage(pkg).then(result => ({
-            source: 'purchasePackage' as const,
-            customerInfo: result.customerInfo
-        }));
-
-        const listenerWithSource = listenerPromise.then(info => ({
-            source: 'listener' as const,
-            customerInfo: info
-        }));
-
-        const result = await Promise.race([purchasePromise, listenerWithSource]);
-        cleanupListener();
-
-        const duration = Date.now() - startTime;
-        const customerInfo = result.customerInfo;
-
-        if (__DEV__) {
-            console.log('[DEBUG PurchaseHandler] Purchase resolved via:', {
-                source: result.source,
-                duration: `${duration}ms`,
-                productId: pkg.product.identifier
-            });
-        }
+        const { customerInfo } = await Purchases.purchasePackage(pkg);
 
         if (__DEV__) {
             console.log('[DEBUG PurchaseHandler] Purchase completed', {
@@ -240,9 +162,6 @@ export async function handlePurchase(
             pkg.product.identifier
         );
     } catch (error) {
-        // Ensure listener cleanup on error
-        cleanupListener();
-
         if (__DEV__) {
             console.error('[DEBUG PurchaseHandler] Purchase error caught', {
                 error,