@umituz/react-native-subscription 2.15.3 → 2.15.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.15.3",
+  "version": "2.15.4",
   "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/hooks/useSubscriptionSettingsConfig.ts

@@ -16,6 +16,7 @@ import { useCreditsArray, getSubscriptionStatusType } from "./useSubscriptionSet
 import { getCreditsConfig } from "../../infrastructure/repositories/CreditsRepositoryProvider";
 import { detectPackageType } from "../../utils/packageTypeDetector";
 import { getCreditAllocation } from "../../utils/creditMapper";
+import { getExpirationDate } from "../../revenuecat/infrastructure/utils/ExpirationDateCalculator";
 import type {
   SubscriptionSettingsConfig,
   SubscriptionStatusType,
@@ -75,8 +76,11 @@ export const useSubscriptionSettingsConfig = (
   }, [premiumEntitlement?.productIdentifier, creditLimit]);
 
   // Get expiration date from RevenueCat entitlement (source of truth)
-  // premiumEntitlement.expirationDate is an ISO string from RevenueCat
-  const entitlementExpirationDate = premiumEntitlement?.expirationDate || null;
+  // Apply sandbox-to-production conversion for better testing UX
+  const entitlementExpirationDate = useMemo(() => {
+    if (!premiumEntitlement) return null;
+    return getExpirationDate(premiumEntitlement);
+  }, [premiumEntitlement]);
 
   // Prefer CustomerInfo expiration (real-time) over cached status
   const expiresAtIso = entitlementExpirationDate || (statusExpirationDate

package/src/revenuecat/infrastructure/utils/ExpirationDateCalculator.ts

@@ -1,15 +1,16 @@
 /**
  * Expiration Date Calculator
  * Handles RevenueCat expiration date extraction with edge case handling
+ * Includes sandbox-to-production date conversion for better testing UX
  */
 
 import type { RevenueCatEntitlement } from '../../domain/types/RevenueCatTypes';
 import { detectPackageType, type SubscriptionPackageType } from '../../../utils/packageTypeDetector';
 
 /**
- * Add subscription period to a date
+ * Add production subscription period to a date
  */
-function addSubscriptionPeriod(date: Date, packageType: SubscriptionPackageType): Date {
+function addProductionPeriod(date: Date, packageType: SubscriptionPackageType): Date {
   const newDate = new Date(date);
 
   switch (packageType) {
@@ -23,7 +24,6 @@ function addSubscriptionPeriod(date: Date, packageType: SubscriptionPackageType)
       newDate.setDate(newDate.getDate() + 365);
       break;
     default:
-      // Unknown type, default to monthly
       newDate.setDate(newDate.getDate() + 30);
       break;
   }
@@ -32,18 +32,48 @@ function addSubscriptionPeriod(date: Date, packageType: SubscriptionPackageType)
 }
 
 /**
- * Adjust expiration date if it equals current date
+ * Convert sandbox expiration to production-equivalent expiration
  *
- * RevenueCat sometimes returns expiration date equal to purchase date
- * immediately after purchase. This causes false "expired" status.
+ * Apple Sandbox durations:
+ * - Weekly: 3 minutes → 7 days
+ * - Monthly: 5 minutes → 30 days
+ * - Yearly: 1 hour → 365 days
  *
- * Solution: If expiration date is today or in the past, add the subscription
- * period (weekly/monthly/yearly) to prevent false expiration.
+ * For better testing UX, we calculate what the expiration would be in production
+ * based on the latest purchase date.
+ */
+function convertSandboxToProduction(
+  latestPurchaseDate: string | null,
+  productIdentifier: string
+): string {
+  const purchaseDate = latestPurchaseDate
+    ? new Date(latestPurchaseDate)
+    : new Date();
+
+  const packageType = detectPackageType(productIdentifier);
+  const productionExpiration = addProductionPeriod(purchaseDate, packageType);
+
+  return productionExpiration.toISOString();
+}
+
+/**
+ * Adjust expiration date for edge cases
+ *
+ * Handles two scenarios:
+ * 1. Sandbox mode: Convert to production-equivalent dates for better UX
+ * 2. Same-day expiration bug: Add period if expiration is in the past
  */
 function adjustExpirationDate(
   expirationDate: string,
-  productIdentifier: string
+  productIdentifier: string,
+  isSandbox: boolean,
+  latestPurchaseDate: string | null
 ): string {
+  // In sandbox mode, show production-equivalent expiration for better testing UX
+  if (isSandbox && __DEV__) {
+    return convertSandboxToProduction(latestPurchaseDate, productIdentifier);
+  }
+
   const expDate = new Date(expirationDate);
   const now = new Date();
 
@@ -54,7 +84,7 @@ function adjustExpirationDate(
 
   // If expiration is today or past, add subscription period
   const packageType = detectPackageType(productIdentifier);
-  const adjustedDate = addSubscriptionPeriod(expDate, packageType);
+  const adjustedDate = addProductionPeriod(expDate, packageType);
 
   return adjustedDate.toISOString();
 }
@@ -70,9 +100,10 @@ export function getExpirationDate(
     return null;
   }
 
-  // Apply edge case fix for same-day expirations
   return adjustExpirationDate(
     entitlement.expirationDate,
-    entitlement.productIdentifier
+    entitlement.productIdentifier,
+    entitlement.isSandbox ?? false,
+    entitlement.latestPurchaseDate ?? null
   );
 }

package/src/domains/README.md.bak

@@ -1,274 +0,0 @@
-# Domains
-
-Specialized domain modules implementing specific business logic and features.
-
-## Location
-
-**Directory**: `src/domains/`
-
-**Type**: Domain Collection
-
-## Strategy
-
-### Domain-Driven Design
-
-This directory implements Domain-Driven Design (DDD) principles:
-
-1. **Wallet Domain**: Credit balance, transactions, and purchase flow
-2. **Paywall Domain**: Upgrade prompts, subscription management
-3. **Config Domain**: Feature flags, subscription configuration
-
-Each domain is self-contained with:
-- **Domain Layer**: Business logic, entities, value objects
-- **Infrastructure Layer**: External integrations, repositories
-- **Presentation Layer**: Domain-specific hooks and components
-
-### Architecture Pattern
-
-```
-┌─────────────────────────────────────┐
-│         Application Layer           │
-│    (Use Cases, Orchestration)       │
-└──────────────┬──────────────────────┘
-               │
-       ┌───────┴────────┐
-       │                │
-┌──────▼──────┐  ┌─────▼──────┐
-│ Wallet      │  │ Paywall    │
-│ Domain      │  │ Domain     │
-├─────────────┤  ├────────────┤
-│ Domain      │  │ Domain     │
-│ Infra       │  │ Infra      │
-│ Presentation│  │ Presentation│
-└──────┬──────┘  └─────┬──────┘
-       │                │
-       └────────┬───────┘
-                │
-       ┌────────▼──────────┐
-       │ Shared Infra      │
-       │ (Firebase, etc)   │
-       └───────────────────┘
-```
-
-## Domain Modules
-
-### Wallet Domain (`wallet/`)
-
-**Responsibility**: Credit balance and transaction management
-
-**Key Features**:
-- Credit balance tracking
-- Transaction history
-- Purchase initialization
-- Real-time updates
-
-**Documentation**: `wallet/README.md`
-
-### Paywall Domain (`paywall/`)
-
-**Responsibility**: Subscription upgrade flows and paywall UI
-
-**Key Features**:
-- Paywall display logic
-- Subscription management
-- Feature gating
-- Upgrade prompts
-
-**Documentation**: `paywall/README.md`
-
-### Config Domain (`config/`)
-
-**Responsibility**: Subscription configuration and feature flags
-
-**Key Features**:
-- Subscription tiers
-- Feature configuration
-- Pricing rules
-- Feature flags
-
-**Documentation**: `config/README.md`
-
-## Restrictions
-
-### REQUIRED
-
-- **Domain Isolation**: Domains MUST NOT directly depend on each other
-- **Interface Segregation**: Use well-defined interfaces between layers
-- **Dependency Inversion**: Depend on abstractions, not concretions
-- **Testability**: All domains MUST be testable in isolation
-
-### PROHIBITED
-
-- **NEVER** share domain logic between domains (use shared kernel if needed)
-- **NEVER** create circular dependencies between domains
-- **DO NOT** bypass domain layer from presentation
-- **NEVER** expose infrastructure details to other domains
-
-### CRITICAL SAFETY
-
-- **ALWAYS** validate invariants at domain boundaries
-- **ALWAYS** implement domain errors for business rule violations
-- **NEVER** allow inconsistent domain state
-- **MUST** implement proper transaction boundaries
-- **ALWAYS** sanitize inputs from external sources
-
-## Rules
-
-### Domain Boundaries
-
-```typescript
-// CORRECT - Respecting domain boundaries
-// Wallet domain handles credits
-const { credits } = useCredits(); // From wallet domain
-
-// Paywall domain handles upgrades
-const { showPaywall } = usePaywallOperations(); // From paywall domain
-
-// INCORRECT - Crossing domain boundaries
-const walletRepository = new WalletRepository();
-// Directly using wallet repo in paywall component
-```
-
-### Domain Errors
-
-```typescript
-// CORRECT - Domain-specific errors
-class InsufficientCreditsError extends DomainError {
-  constructor(required: number, available: number) {
-    super(`Insufficient credits: need ${required}, have ${available}`);
-  }
-}
-
-// INCORRECT - Generic errors
-throw new Error('Not enough credits'); // Loses domain context
-```
-
-### Dependency Direction
-
-```typescript
-// CORRECT - Dependency inversion
-interface ICreditsRepository {
-  getBalance(userId: string): Promise<number>;
-  deductCredits(userId: string, amount: number): Promise<void>;
-}
-
-// Domain depends on interface, not implementation
-class CreditService {
-  constructor(private repo: ICreditsRepository) {}
-}
-
-// INCORRECT - Concrete dependency
-class CreditService {
-  constructor(private repo: FirebaseCreditsRepository) {}
-  // Tightly coupled to Firebase
-}
-```
-
-## AI Agent Guidelines
-
-### When Working with Domains
-
-1. **Always** respect domain boundaries
-2. **Always** use dependency inversion
-3. **Always** implement domain-specific errors
-4. **Always** validate invariants at boundaries
-5. **Never** create circular dependencies
-
-### Integration Checklist
-
-- [ ] Identify correct domain for feature
-- [ ] Respect domain boundaries
-- [ ] Use appropriate interfaces
-- [ ] Handle domain errors
-- [ ] Test domain in isolation
-- [ ] Document domain interactions
-- [ ] Validate invariants
-- [ ] Implement transaction boundaries
-- [ ] Test cross-domain scenarios
-- [ ] Verify no circular dependencies
-
-### Common Patterns
-
-1. **Aggregate Root**: Single entry point for aggregate
-2. **Value Objects**: Immutable values with no identity
-3. **Domain Events**: Publish domain events for side effects
-4. **Repositories**: Abstract data access
-5. **Factories**: Complex object creation
-6. **Domain Services**: Business logic that doesn't fit entities
-7. **Specification**: Business rule encapsulation
-8. **Anti-Corruption Layer**: Isolate from external systems
-
-## Related Documentation
-
-- **Wallet Domain**: `wallet/README.md`
-- **Paywall Domain**: `paywall/README.md`
-- **Config Domain**: `config/README.md`
-- **Domain Layer**: `../domain/README.md`
-- **Infrastructure**: `../infrastructure/README.md`
-
-## Domain Structure
-
-```
-src/domains/
-├── wallet/                # Wallet and credits domain
-│   ├── domain/           # Business logic
-│   ├── infrastructure/   # External integrations
-│   └── presentation/     # UI hooks and components
-├── paywall/              # Paywall and upgrades domain
-│   ├── domain/
-│   ├── infrastructure/
-│   └── presentation/
-└── config/               # Configuration domain
-    ├── domain/
-    ├── infrastructure/
-    └── presentation/
-```
-
-## Creating a New Domain
-
-When creating a new domain:
-
-1. **Define Boundaries**: What is the domain's responsibility?
-2. **Identify Entities**: What are the core business objects?
-3. **Define Invariants**: What rules must always be true?
-4. **Design Interfaces**: How will other layers interact?
-5. **Implement Repository**: Abstract data access
-6. **Create Presentation Layer**: Hooks and components
-7. **Write Tests**: Test domain logic in isolation
-8. **Document**: Provide comprehensive README
-
-Example:
-
-```typescript
-// Domain entity
-export class FeatureFlag {
-  constructor(
-    public readonly id: string,
-    public readonly name: string,
-    private _isEnabled: boolean
-  ) {}
-
-  get isEnabled(): boolean {
-    return this._isEnabled;
-  }
-
-  enable(): void {
-    this._isEnabled = true;
-  }
-
-  disable(): void {
-    this._isEnabled = false;
-  }
-}
-
-// Repository interface
-export interface IFeatureFlagRepository {
-  findById(id: string): Promise<FeatureFlag | null>;
-  save(flag: FeatureFlag): Promise<void>;
-}
-
-// Presentation hook
-export function useFeatureFlag(featureId: string) {
-  // Hook implementation
-}
-```

package/src/domains/wallet/README.md.bak

@@ -1,209 +0,0 @@
-# Wallet Domain
-
-Credit balance management, transaction history tracking, and product metadata management.
-
-## Location
-
-**Directory**: `src/domains/wallet/`
-
-**Type**: Domain
-
-## Strategy
-
-### Domain Architecture
-
-The Wallet Domain implements a layered architecture for credit management:
-
-1. **Domain Layer**
-   - Entities: `UserCredits`, `Transaction`, `CreditType`
-   - Value Objects: `CreditAmount`, `TransactionReason`
-   - Errors: `InsufficientCreditsError`, `InvalidCreditAmountError`
-
-2. **Infrastructure Layer**
-   - Repositories: `CreditsRepository`, `TransactionsRepository`
-   - Firebase Services: Data persistence and real-time updates
-   - Mappers: Entity ↔ DTO transformations
-
-3. **Presentation Layer**
-   - Hooks: `useCredits`, `useDeductCredit`, `useInitializeCredits`
-   - Components: Credit displays, transaction lists
-
-### Credit Flow
-
-1. **Initialization**
-   - Fetch initial credit balance from backend
-   - Subscribe to real-time credit updates
-   - Cache in TanStack Query
-
-2. **Operations**
-   - Check balance before operations
-   - Deduct credits optimistically
-   - Sync with backend
-   - Rollback on failure
-
-3. **Transaction History**
-   - Record all credit operations
-   - Provide audit trail
-   - Support pagination and filtering
-
-### Integration Points
-
-- **Firebase**: Real database for persistence
-- **TanStack Query**: Client-side caching and state management
-- **RevenueCat**: Purchase flow integration
-- **Presentation Hooks**: UI integration layer
-
-## Restrictions
-
-### REQUIRED
-
-- **User Authentication**: All operations require authenticated user
-- **Server Validation**: Credit operations MUST be validated server-side
-- **Transaction Recording**: All credit changes MUST be recorded in transaction history
-- **Error Handling**: MUST handle insufficient credits gracefully
-
-### PROHIBITED
-
-- **NEVER** allow client-side credit modifications without server validation
-- **NEVER** deduct credits without sufficient balance
-- **DO NOT** expose internal repository logic to UI
-- **NEVER** store credit balance in AsyncStorage (use secure backend)
-
-### CRITICAL SAFETY
-
-- **ALWAYS** validate credit amounts (must be positive)
-- **ALWAYS** implement optimistic updates with rollback
-- **NEVER** trust client-side credit balance for security decisions
-- **MUST** implement retry logic for failed operations
-- **ALWAYS** sanitize transaction reasons to prevent injection attacks
-
-## Rules
-
-### Repository Initialization
-
-```typescript
-// CORRECT - Proper repository setup
-const creditsRepository = new CreditsRepository({
-  firebase: firebaseInstance,
-  userId: user.uid,
-});
-
-// INCORRECT - Missing userId
-const creditsRepository = new CreditsRepository({
-  firebase: firebaseInstance,
-  // userId undefined
-});
-```
-
-### Credit Operations
-
-```typescript
-// CORRECT - Check before deduct
-const hasEnoughCredits = await creditsRepository.checkBalance(requiredAmount);
-if (hasEnoughCredits) {
-  await creditsRepository.deductCredits(requiredAmount, 'feature_usage');
-}
-
-// INCORRECT - Deduct without checking
-await creditsRepository.deductCredits(requiredAmount, 'feature_usage');
-// May throw InsufficientCreditsError
-```
-
-### Transaction Recording
-
-```typescript
-// CORRECT - Record all operations
-await creditsRepository.deductCredits(
-  amount,
-  reason,
-  { featureId, metadata } // Include context
-);
-
-// INCORRECT - Missing context
-await creditsRepository.deductCredits(amount, reason);
-// Lost audit trail
-```
-
-### Error Handling
-
-```typescript
-// CORRECT - Handle specific errors
-try {
-  await creditsRepository.deductCredits(amount, reason);
-} catch (error) {
-  if (error instanceof InsufficientCreditsError) {
-    showUpgradePrompt();
-  } else if (error instanceof InvalidCreditAmountError) {
-    showInvalidAmountError();
-  } else {
-    showGenericError();
-  }
-}
-
-// INCORRECT - Generic error handling
-try {
-  await creditsRepository.deductCredits(amount, reason);
-} catch (error) {
-  console.error(error); // Doesn't help user
-}
-```
-
-## AI Agent Guidelines
-
-### When Implementing Credit Operations
-
-1. **Always** check balance before deducting
-2. **Always** provide transaction reason and metadata
-3. **Always** handle insufficient credits gracefully
-4. **Always** implement optimistic updates with rollback
-5. **Never** trust client-side balance for security
-
-### Integration Checklist
-
-- [ ] Initialize repository with valid userId
-- [ ] Implement error boundaries
-- [ ] Handle loading states
-- [ ] Provide user feedback for all operations
-- [ ] Test with insufficient credits
-- [ ] Test with zero balance
-- [ ] Test transaction history
-- [ ] Test real-time updates
-- [ ] Implement retry logic
-- [ ] Sanitize user inputs
-
-### Common Patterns
-
-1. **Pre-check**: Always verify balance before operations
-2. **Optimistic Updates**: Update UI immediately, rollback on failure
-3. **Transaction Context**: Include featureId and metadata in all operations
-4. **Error Recovery**: Provide upgrade path when credits insufficient
-5. **Real-time Sync**: Subscribe to credit changes for multi-device sync
-6. **Audit Trail**: Maintain complete transaction history
-7. **Caching**: Use TanStack Query for performance
-8. **Validation**: Validate all inputs on both client and server
-
-## Related Documentation
-
-- **Credits Repository**: `infrastructure/repositories/README.md`
-- **useCredits Hook**: `../../presentation/hooks/useCredits.md`
-- **useDeductCredit Hook**: `../../presentation/hooks/useDeductCredit.md`
-- **UserCredits Entity**: `domain/entities/README.md`
-- **Transaction Errors**: `domain/errors/README.md`
-
-## Domain Structure
-
-```
-src/domains/wallet/
-├── domain/
-│   ├── entities/           # Core entities
-│   │   ├── UserCredits.ts
-│   │   └── Transaction.ts
-│   ├── value-objects/      # Value objects
-│   └── errors/             # Domain errors
-├── infrastructure/
-│   ├── repositories/       # Data access
-│   └── services/          # External services
-└── presentation/
-    ├── hooks/             # React hooks
-    └── components/        # UI components
-```