@umituz/react-native-subscription 2.35.4 → 2.35.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.35.4",
+  "version": "2.35.6",
   "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/revenuecat/core/types/RevenueCatConfig.ts

@@ -1,4 +1,5 @@
 import type { CustomerInfo } from "react-native-purchases";
+import type { PackageType } from "./RevenueCatTypes";
 
 /**
  * RevenueCat Configuration
@@ -20,7 +21,8 @@ export interface RevenueCatConfig {
     userId: string,
     productId: string,
     customerInfo: CustomerInfo,
-    source?: string // Purchase source tracking (app-specific)
+    source?: string, // Purchase source tracking (app-specific)
+    packageType?: PackageType | null // From PurchasesPackage.packageType - subscription duration (WEEKLY, MONTHLY, ANNUAL, etc.)
   ) => Promise<void> | void;
   onRestoreCompleted?: (
     userId: string,

package/src/domains/revenuecat/core/types/RevenueCatData.ts

@@ -1,4 +1,4 @@
-import type { Store, OwnershipType } from "./RevenueCatTypes";
+import type { Store, OwnershipType, PackageType } from "./RevenueCatTypes";
 
 /**
  * RevenueCat subscription data (Single Source of Truth)
@@ -10,7 +10,8 @@ export interface RevenueCatData {
   willRenew: boolean | null;
   originalTransactionId: string | null;
   isPremium: boolean;
-  periodType: string | null; // From RevenueCat SDK (NORMAL, INTRO, TRIAL)
+  periodType: string | null; // From RevenueCat SDK (NORMAL, INTRO, TRIAL) - pricing type
+  packageType: PackageType | null; // From PurchasesPackage.packageType - subscription duration (WEEKLY, MONTHLY, ANNUAL, etc.)
   unsubscribeDetectedAt: string | null;
   billingIssueDetectedAt: string | null;
   store: Store | null; // From PurchasesEntitlementInfo['store']

package/src/domains/revenuecat/core/types/RevenueCatTypes.ts

@@ -3,7 +3,7 @@
  * Proper typing for RevenueCat entitlements and errors
  */
 
-import type { CustomerInfo, PurchasesEntitlementInfo } from "react-native-purchases";
+import type { CustomerInfo, PurchasesEntitlementInfo, PurchasesPackage } from "react-native-purchases";
 
 /**
  * Default entitlement identifier
@@ -23,6 +23,13 @@ export type Store = PurchasesEntitlementInfo['store'];
  */
 export type OwnershipType = PurchasesEntitlementInfo['ownershipType'];
 
+/**
+ * PackageType - Directly from RevenueCat SDK
+ * Represents subscription duration (WEEKLY, MONTHLY, ANNUAL, LIFETIME, etc.)
+ * Automatically stays in sync with RevenueCat SDK updates
+ */
+export type PackageType = PurchasesPackage['packageType'];
+
 /**
  * RevenueCat Entitlement Info
  * Represents active entitlement data from CustomerInfo

package/src/domains/subscription/application/SubscriptionSyncProcessor.ts

@@ -7,16 +7,30 @@ import { emitCreditsUpdated } from "./syncEventEmitter";
 import { generatePurchaseId, generateRenewalId } from "./syncIdGenerators";
 import { handleExpiredSubscription, handleFreeUserInitialization, handlePremiumStatusSync } from "./statusChangeHandlers";
 import { NO_SUBSCRIPTION_PRODUCT_ID } from "./syncConstants";
+import type { PackageType } from "../../revenuecat/core/types";
 
 export class SubscriptionSyncProcessor {
-  constructor(private entitlementId: string) {}
+  constructor(
+    private entitlementId: string,
+    private getAnonymousUserId: () => Promise<string>
+  ) {}
 
-  async processPurchase(userId: string, productId: string, customerInfo: CustomerInfo, source?: PurchaseSource) {
+  private async getCreditsUserId(revenueCatUserId: string): Promise<string> {
+    if (!revenueCatUserId || revenueCatUserId.length === 0) {
+      return this.getAnonymousUserId();
+    }
+    return revenueCatUserId;
+  }
+
+  async processPurchase(userId: string, productId: string, customerInfo: CustomerInfo, source?: PurchaseSource, packageType?: PackageType | null) {
     const revenueCatData = extractRevenueCatData(customerInfo, this.entitlementId);
+    revenueCatData.packageType = packageType ?? null;
     const purchaseId = generatePurchaseId(revenueCatData.originalTransactionId, productId);
 
+    const creditsUserId = await this.getCreditsUserId(userId);
+
     await getCreditsRepository().initializeCredits(
-      userId,
+      creditsUserId,
       purchaseId,
       productId,
       source ?? PURCHASE_SOURCE.SETTINGS,
@@ -24,7 +38,7 @@ export class SubscriptionSyncProcessor {
       PURCHASE_TYPE.INITIAL
     );
 
-    emitCreditsUpdated(userId);
+    emitCreditsUpdated(creditsUserId);
   }
 
   async processRenewal(userId: string, productId: string, newExpirationDate: string, customerInfo: CustomerInfo) {
@@ -32,8 +46,10 @@ export class SubscriptionSyncProcessor {
     revenueCatData.expirationDate = newExpirationDate || revenueCatData.expirationDate;
     const purchaseId = generateRenewalId(revenueCatData.originalTransactionId, productId, newExpirationDate);
 
+    const creditsUserId = await this.getCreditsUserId(userId);
+
     await getCreditsRepository().initializeCredits(
-      userId,
+      creditsUserId,
       purchaseId,
       productId,
       PURCHASE_SOURCE.RENEWAL,
@@ -41,7 +57,7 @@ export class SubscriptionSyncProcessor {
       PURCHASE_TYPE.RENEWAL
     );
 
-    emitCreditsUpdated(userId);
+    emitCreditsUpdated(creditsUserId);
   }
 
   async processStatusChange(
@@ -52,21 +68,23 @@ export class SubscriptionSyncProcessor {
     willRenew?: boolean,
     periodType?: PeriodType
   ) {
+    const creditsUserId = await this.getCreditsUserId(userId);
+
     // Expired subscription case
     if (!isPremium && productId) {
-      await handleExpiredSubscription(userId);
+      await handleExpiredSubscription(creditsUserId);
       return;
     }
 
     // Free user case
     if (!isPremium && !productId) {
-      await handleFreeUserInitialization(userId);
+      await handleFreeUserInitialization(creditsUserId);
       return;
     }
 
     // Premium user case
     await handlePremiumStatusSync(
-      userId,
+      creditsUserId,
       isPremium,
       productId ?? NO_SUBSCRIPTION_PRODUCT_ID,
       expiresAt ?? null,

package/src/domains/subscription/application/SubscriptionSyncService.ts

@@ -2,17 +2,21 @@ import type { CustomerInfo } from "react-native-purchases";
 import { type PeriodType, type PurchaseSource } from "../core/SubscriptionConstants";
 import { subscriptionEventBus, SUBSCRIPTION_EVENTS } from "../../../shared/infrastructure/SubscriptionEventBus";
 import { SubscriptionSyncProcessor } from "./SubscriptionSyncProcessor";
+import type { PackageType } from "../../revenuecat/core/types";
 
 export class SubscriptionSyncService {
   private processor: SubscriptionSyncProcessor;
 
-  constructor(entitlementId: string) {
-    this.processor = new SubscriptionSyncProcessor(entitlementId);
+  constructor(
+    entitlementId: string,
+    getAnonymousUserId: () => Promise<string>
+  ) {
+    this.processor = new SubscriptionSyncProcessor(entitlementId, getAnonymousUserId);
   }
 
-  async handlePurchase(userId: string, productId: string, customerInfo: CustomerInfo, source?: PurchaseSource) {
+  async handlePurchase(userId: string, productId: string, customerInfo: CustomerInfo, source?: PurchaseSource, packageType?: PackageType | null) {
     try {
-      await this.processor.processPurchase(userId, productId, customerInfo, source);
+      await this.processor.processPurchase(userId, productId, customerInfo, source, packageType);
       subscriptionEventBus.emit(SUBSCRIPTION_EVENTS.PURCHASE_COMPLETED, { userId, productId });
     } catch (error) {
       console.error('[SubscriptionSyncService] Purchase processing failed', {

package/src/domains/subscription/application/SubscriptionSyncUtils.ts

@@ -28,6 +28,7 @@ export const extractRevenueCatData = (customerInfo: CustomerInfo, entitlementId:
       willRenew: null,
       originalTransactionId: null,
       periodType: null,
+      packageType: null,
       isPremium: false,
       unsubscribeDetectedAt: null,
       billingIssueDetectedAt: null,
@@ -41,6 +42,7 @@ export const extractRevenueCatData = (customerInfo: CustomerInfo, entitlementId:
     willRenew: entitlement.willRenew ?? null,
     originalTransactionId: entitlement.originalPurchaseDate ?? null,
     periodType: validatePeriodType(entitlement.periodType),
+    packageType: null,
     isPremium,
     unsubscribeDetectedAt: entitlement.unsubscribeDetectedAt ?? null,
     billingIssueDetectedAt: entitlement.billingIssueDetectedAt ?? null,

package/src/domains/subscription/application/initializer/BackgroundInitializer.ts

@@ -5,11 +5,11 @@ import type { SubscriptionInitConfig } from "../SubscriptionInitializerTypes";
 declare const __DEV__: boolean;
 
 export async function startBackgroundInitialization(config: SubscriptionInitConfig): Promise<() => void> {
-  const initializeInBackground = async (userId?: string): Promise<void> => {
+  const initializeInBackground = async (revenueCatUserId?: string): Promise<void> => {
     if (typeof __DEV__ !== 'undefined' && __DEV__) {
-      console.log('[BackgroundInitializer] initializeInBackground called with userId:', userId || '(undefined - anonymous)');
+      console.log('[BackgroundInitializer] initializeInBackground called with userId:', revenueCatUserId || '(undefined - anonymous)');
     }
-    await SubscriptionManager.initialize(userId);
+    await SubscriptionManager.initialize(revenueCatUserId);
   };
 
   const auth = config.getFirebaseAuth();
@@ -21,22 +21,22 @@ export async function startBackgroundInitialization(config: SubscriptionInitConf
     console.log('[BackgroundInitializer] Starting background initialization');
   }
 
-  const initialUserId = getCurrentUserId(() => auth);
+  const initialRevenueCatUserId = getCurrentUserId(() => auth);
 
   if (typeof __DEV__ !== 'undefined' && __DEV__) {
-    console.log('[BackgroundInitializer] Initial userId:', initialUserId || '(undefined - anonymous)');
+    console.log('[BackgroundInitializer] Initial RevenueCat userId:', initialRevenueCatUserId || '(undefined - anonymous)');
   }
 
-  await initializeInBackground(initialUserId);
+  await initializeInBackground(initialRevenueCatUserId);
 
-  const unsubscribe = setupAuthStateListener(() => auth, async (newUserId) => {
+  const unsubscribe = setupAuthStateListener(() => auth, async (newRevenueCatUserId) => {
     if (typeof __DEV__ !== 'undefined' && __DEV__) {
-      console.log('[BackgroundInitializer] Auth state listener triggered, reinitializing with userId:', newUserId || '(undefined - anonymous)');
+      console.log('[BackgroundInitializer] Auth state listener triggered, reinitializing with userId:', newRevenueCatUserId || '(undefined - anonymous)');
     }
     try {
-      await initializeInBackground(newUserId);
+      await initializeInBackground(newRevenueCatUserId);
     } catch (error) {
-      console.error('[BackgroundInitializer] Failed to reinitialize on auth change', { userId: newUserId, error });
+      console.error('[BackgroundInitializer] Failed to reinitialize on auth change', { userId: newRevenueCatUserId, error });
     }
   });
 

package/src/domains/subscription/application/initializer/ServiceConfigurator.ts

@@ -5,7 +5,7 @@ import { SubscriptionSyncService } from "../SubscriptionSyncService";
 import type { SubscriptionInitConfig } from "../SubscriptionInitializerTypes";
 
 export function configureServices(config: SubscriptionInitConfig, apiKey: string): SubscriptionSyncService {
-  const { entitlementId, credits, creditPackages, getFirebaseAuth, showAuthModal, onCreditsUpdated } = config;
+  const { entitlementId, credits, creditPackages, getFirebaseAuth, showAuthModal, onCreditsUpdated, getAnonymousUserId } = config;
 
   if (!creditPackages) {
     throw new Error('[ServiceConfigurator] creditPackages configuration is required');
@@ -16,14 +16,14 @@ export function configureServices(config: SubscriptionInitConfig, apiKey: string
     creditPackageAmounts: creditPackages.amounts
   });
 
-  const syncService = new SubscriptionSyncService(entitlementId);
+  const syncService = new SubscriptionSyncService(entitlementId, getAnonymousUserId);
 
   SubscriptionManager.configure({
     config: {
       apiKey,
       entitlementIdentifier: entitlementId,
       consumableProductIdentifiers: [creditPackages.identifierPattern],
-      onPurchaseCompleted: (u: string, p: string, c: any, s: any) => syncService.handlePurchase(u, p, c, s),
+      onPurchaseCompleted: (u: string, p: string, c: any, s: any, pkgType: any) => syncService.handlePurchase(u, p, c, s, pkgType),
       onRenewalDetected: (u: string, p: string, expires: string, c: any) => syncService.handleRenewal(u, p, expires, c),
       onPremiumStatusChanged: (u: string, isP: boolean, pId: any, exp: any, willR: any, pt: any) => syncService.handlePremiumStatusChanged(u, isP, pId, exp, willR, pt),
       onCreditsUpdated,

package/src/domains/subscription/application/statusChangeHandlers.ts

@@ -50,6 +50,7 @@ export const handlePremiumStatusSync = async (
     willRenew,
     isPremium,
     periodType,
+    packageType: null,
     originalTransactionId: null,
     unsubscribeDetectedAt: null,
     billingIssueDetectedAt: null,

package/src/domains/subscription/application/syncConstants.ts

@@ -7,6 +7,7 @@ export const DEFAULT_FREE_USER_DATA: RevenueCatData = {
   expirationDate: null,
   willRenew: false,
   periodType: null,
+  packageType: null,
   originalTransactionId: null,
   unsubscribeDetectedAt: null,
   billingIssueDetectedAt: null,

package/src/domains/subscription/infrastructure/handlers/PurchaseStatusResolver.ts

@@ -12,6 +12,7 @@ export interface PremiumStatus {
   billingIssuesDetected: boolean;
   isSandbox: boolean;
   periodType: string | null;
+  packageType: string | null;
   store: string | null;
   gracePeriodExpiresDate: Date | null;
   unsubscribeDetectedAt: Date | null;
@@ -32,6 +33,7 @@ export class PurchaseStatusResolver {
         billingIssuesDetected: entitlement.billingIssueDetectedAt !== null && entitlement.billingIssueDetectedAt !== undefined,
         isSandbox: entitlement.isSandbox ?? false,
         periodType: entitlement.periodType ?? null,
+        packageType: null,
         store: null,
         gracePeriodExpiresDate: null,
         unsubscribeDetectedAt: toDate(entitlement.unsubscribeDetectedAt) ?? null,
@@ -48,6 +50,7 @@ export class PurchaseStatusResolver {
       billingIssuesDetected: false,
       isSandbox: false,
       periodType: null,
+      packageType: null,
       store: null,
       gracePeriodExpiresDate: null,
       unsubscribeDetectedAt: null,

package/src/domains/subscription/infrastructure/services/RestoreHandler.ts

@@ -12,7 +12,7 @@ import {
   isNetworkError,
   isInvalidCredentialsError,
 } from "../../../revenuecat/core/types";
-import { syncPremiumStatus, notifyRestoreCompleted } from "../utils/PremiumStatusSyncer";
+import { notifyRestoreCompleted } from "../utils/PremiumStatusSyncer";
 
 export interface RestoreHandlerDeps {
   config: RevenueCatConfig;
@@ -28,9 +28,6 @@ export async function handleRestore(deps: RestoreHandlerDeps, userId: string): P
     const isPremium = !!entitlement;
     const productId = entitlement?.productIdentifier ?? null;
 
-    if (isPremium) {
-      await syncPremiumStatus(deps.config, userId, customerInfo);
-    }
     await notifyRestoreCompleted(deps.config, userId, isPremium, customerInfo);
 
     return { success: true, isPremium, productId, customerInfo };

package/src/domains/subscription/infrastructure/services/purchase/PurchaseExecutor.ts

@@ -1,14 +1,15 @@
 import Purchases, { type PurchasesPackage, type CustomerInfo } from "react-native-purchases";
 import type { PurchaseResult } from "../../../../../shared/application/ports/IRevenueCatService";
-import type { RevenueCatConfig } from "../../../../revenuecat/core/types";
-import { syncPremiumStatus, notifyPurchaseCompleted } from "../../utils/PremiumStatusSyncer";
+import type { RevenueCatConfig, PackageType } from "../../../../revenuecat/core/types";
+import { notifyPurchaseCompleted } from "../../utils/PremiumStatusSyncer";
 import { getSavedPurchase, clearSavedPurchase } from "../../../presentation/useAuthAwarePurchase";
 
 async function executeConsumablePurchase(
   config: RevenueCatConfig,
   userId: string,
   productId: string,
-  customerInfo: CustomerInfo
+  customerInfo: CustomerInfo,
+  packageType: PackageType | null
 ): Promise<PurchaseResult> {
   const savedPurchase = getSavedPurchase();
   const source = savedPurchase?.source;
@@ -16,7 +17,7 @@ async function executeConsumablePurchase(
     clearSavedPurchase();
   }
 
-  await notifyPurchaseCompleted(config, userId, productId, customerInfo, source);
+  await notifyPurchaseCompleted(config, userId, productId, customerInfo, source, packageType);
 
   return {
     success: true,
@@ -34,7 +35,8 @@ async function executeSubscriptionPurchase(
   userId: string,
   productId: string,
   customerInfo: CustomerInfo,
-  entitlementIdentifier: string
+  entitlementIdentifier: string,
+  packageType: PackageType | null
 ): Promise<PurchaseResult> {
   const isPremium = !!customerInfo.entitlements.active[entitlementIdentifier];
   const savedPurchase = getSavedPurchase();
@@ -51,16 +53,11 @@ async function executeSubscriptionPurchase(
       entitlementIdentifier,
       activeEntitlements: Object.keys(customerInfo.entitlements.active),
       source,
+      packageType,
     });
   }
 
-  await syncPremiumStatus(config, userId, customerInfo);
-
-  if (typeof __DEV__ !== "undefined" && __DEV__) {
-    console.log("[PurchaseExecutor] syncPremiumStatus completed");
-  }
-
-  await notifyPurchaseCompleted(config, userId, productId, customerInfo, source);
+  await notifyPurchaseCompleted(config, userId, productId, customerInfo, source, packageType);
 
   if (typeof __DEV__ !== "undefined" && __DEV__) {
     console.log("[PurchaseExecutor] Purchase flow completed successfully");
@@ -83,7 +80,8 @@ export async function executePurchase(
   console.log('🔵 [PurchaseExecutor] executePurchase called', {
     productId: pkg.product.identifier,
     userId,
-    isConsumable
+    isConsumable,
+    packageType: pkg.packageType
   });
 
   console.log('🚀 [PurchaseExecutor] Calling Purchases.purchasePackage (RevenueCat SDK)');
@@ -91,10 +89,11 @@ export async function executePurchase(
   console.log('✅ [PurchaseExecutor] Purchases.purchasePackage completed');
 
   const productId = pkg.product.identifier;
+  const packageType = pkg.packageType ?? null;
 
   if (isConsumable) {
     console.log('💰 [PurchaseExecutor] Processing as consumable purchase');
-    return executeConsumablePurchase(config, userId, productId, customerInfo);
+    return executeConsumablePurchase(config, userId, productId, customerInfo, packageType);
   }
 
   console.log('📅 [PurchaseExecutor] Processing as subscription purchase');
@@ -103,6 +102,7 @@ export async function executePurchase(
     userId,
     productId,
     customerInfo,
-    config.entitlementIdentifier
+    config.entitlementIdentifier,
+    packageType
   );
 }

package/src/domains/subscription/infrastructure/utils/PremiumStatusSyncer.ts

@@ -4,7 +4,7 @@
  */
 
 import type { CustomerInfo } from "react-native-purchases";
-import type { RevenueCatConfig } from "../../../revenuecat/core/types";
+import type { RevenueCatConfig, PackageType } from "../../../revenuecat/core/types";
 import type { PurchaseSource } from "../../../subscription/core/SubscriptionConstants";
 import { getPremiumEntitlement } from "../../../revenuecat/core/types";
 
@@ -88,19 +88,21 @@ export async function notifyPurchaseCompleted(
     userId: string,
     productId: string,
     customerInfo: CustomerInfo,
-    source?: PurchaseSource
+    source?: PurchaseSource,
+    packageType?: PackageType | null
 ): Promise<void> {
     if (!config.onPurchaseCompleted) {
         return;
     }
 
     try {
-        await config.onPurchaseCompleted(userId, productId, customerInfo, source);
+        await config.onPurchaseCompleted(userId, productId, customerInfo, source, packageType);
     } catch (error) {
         console.error('[PremiumStatusSyncer] Purchase completion callback failed', {
             userId,
             productId,
             source,
+            packageType,
             error
         });
         // Silently fail callback notifications to prevent crashing the main flow

package/src/domains/subscription/presentation/screens/SubscriptionDetailScreen.tsx

@@ -55,6 +55,7 @@ export const SubscriptionDetailScreen: React.FC<SubscriptionDetailScreenProps> =
             productIdentifier={config.productIdentifier}
             productName={config.productName}
             periodType={config.periodType}
+            packageType={config.packageType}
             store={config.store}
             originalPurchaseDate={config.originalPurchaseDate}
             latestPurchaseDate={config.latestPurchaseDate}

package/src/domains/subscription/presentation/screens/SubscriptionDetailScreen.types.ts

@@ -62,6 +62,7 @@ export interface SubscriptionDetailConfig {
   productIdentifier?: string | null;
   productName?: string | null;
   periodType?: string | null;
+  packageType?: string | null;
   store?: string | null;
   originalPurchaseDate?: string | null;
   latestPurchaseDate?: string | null;

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

@@ -20,6 +20,7 @@ export const SubscriptionHeader: React.FC<SubscriptionHeaderProps> = ({
   translations,
   willRenew,
   periodType,
+  packageType,
   store,
   originalPurchaseDate,
   latestPurchaseDate,
@@ -59,6 +60,7 @@ export const SubscriptionHeader: React.FC<SubscriptionHeaderProps> = ({
         styles={styles}
         willRenew={willRenew}
         periodType={periodType}
+        packageType={packageType}
         store={store}
         originalPurchaseDate={originalPurchaseDate}
         latestPurchaseDate={latestPurchaseDate}

package/src/domains/subscription/presentation/screens/components/SubscriptionHeader.types.ts

@@ -31,6 +31,7 @@ export interface SubscriptionHeaderProps {
   productIdentifier?: string | null;
   productName?: string | null;
   periodType?: string | null;
+  packageType?: string | null;
   store?: string | null;
   originalPurchaseDate?: string | null;
   latestPurchaseDate?: string | null;

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

@@ -3,6 +3,21 @@ import { View } from "react-native";
 import { DetailRow } from "../../components/details/DetailRow";
 import type { SubscriptionHeaderProps } from "./SubscriptionHeader.types";
 
+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;
@@ -13,6 +28,7 @@ interface SubscriptionHeaderContentProps {
   styles: any;
   willRenew?: boolean | null;
   periodType?: string | null;
+  packageType?: string | null;
   store?: string | null;
   originalPurchaseDate?: string | null;
   latestPurchaseDate?: string | null;
@@ -30,6 +46,7 @@ export const SubscriptionHeaderContent: React.FC<SubscriptionHeaderContentProps>
   styles,
   willRenew,
   periodType,
+  packageType,
   store,
   originalPurchaseDate,
   latestPurchaseDate,
@@ -76,10 +93,10 @@ export const SubscriptionHeaderContent: React.FC<SubscriptionHeaderContentProps>
             valueStyle={styles.value}
           />
         )}
-        {periodType && translations.periodTypeLabel && (
+        {(packageType || periodType) && translations.periodTypeLabel && (
           <DetailRow
             label={translations.periodTypeLabel}
-            value={periodType === "NORMAL" ? "Standard" : periodType}
+            value={formatSubscriptionPeriod(packageType, periodType)}
             style={styles.row}
             labelStyle={styles.label}
             valueStyle={styles.value}
@@ -122,7 +139,7 @@ export const SubscriptionHeaderContent: React.FC<SubscriptionHeaderContentProps>
             valueStyle={styles.value}
           />
         )}
-        {isSandbox && translations.sandboxLabel && (
+        {typeof __DEV__ !== 'undefined' && __DEV__ && isSandbox && translations.sandboxLabel && (
           <DetailRow
             label={translations.sandboxLabel}
             value="Test Mode"

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

@@ -89,6 +89,7 @@ export const useSubscriptionStatus = (): SubscriptionStatusResult => {
     billingIssuesDetected: data?.billingIssuesDetected ?? false,
     isSandbox: data?.isSandbox ?? false,
     periodType: data?.periodType ?? null,
+    packageType: data?.packageType ?? null,
     store: data?.store ?? null,
     gracePeriodExpiresDate: data?.gracePeriodExpiresDate ?? null,
     unsubscribeDetectedAt: data?.unsubscribeDetectedAt ?? null,

package/src/domains/subscription/presentation/useSubscriptionStatus.types.ts

@@ -8,6 +8,7 @@ export interface SubscriptionStatusResult {
   billingIssuesDetected: boolean;
   isSandbox: boolean;
   periodType: string | null;
+  packageType: string | null;
   store: string | null;
   gracePeriodExpiresDate: Date | null;
   unsubscribeDetectedAt: Date | null;