@umituz/react-native-subscription 2.14.88 → 2.14.89

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-subscription",
-  "version": "2.14.88",
+  "version": "2.14.89",
   "description": "Complete subscription management with RevenueCat, paywall UI, and credits system for React Native apps",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
@@ -35,7 +35,8 @@
     "@umituz/react-native-design-system": "latest",
     "@umituz/react-native-firebase": "latest",
     "@umituz/react-native-localization": "latest",
-    "@umituz/react-native-storage": "latest"
+    "@umituz/react-native-storage": "latest",
+    "@umituz/react-native-timezone": "^1.3.5"
   },
   "peerDependencies": {
     "@tanstack/react-query": ">=5.0.0",

package/src/domain/entities/SubscriptionStatus.ts

@@ -2,7 +2,14 @@
  * Subscription Status Entity
  */
 
-export type SubscriptionStatusType = 'active' | 'expired' | 'canceled' | 'none';
+export const SUBSCRIPTION_STATUS = {
+  ACTIVE: 'active',
+  EXPIRED: 'expired',
+  CANCELED: 'canceled',
+  NONE: 'none',
+} as const;
+
+export type SubscriptionStatusType = (typeof SUBSCRIPTION_STATUS)[keyof typeof SUBSCRIPTION_STATUS];
 
 export interface SubscriptionStatus {
     isPremium: boolean;

package/src/domains/wallet/presentation/components/TransactionItem.tsx

@@ -12,6 +12,7 @@ import {
     AtomicText,
     AtomicIcon,
 } from "@umituz/react-native-design-system";
+import { timezoneService } from "@umituz/react-native-timezone";
 import type { CreditLog, TransactionReason } from "../../domain/types/transaction.types";
 
 export interface TransactionItemTranslations {
@@ -47,7 +48,7 @@ const getReasonIcon = (reason: TransactionReason): string => {
 
 const defaultDateFormatter = (timestamp: number): string => {
   const date = new Date(timestamp);
-  return date.toLocaleDateString(undefined, {
+  return timezoneService.formatDateTime(date, "en-US", {
     month: "short",
     day: "numeric",
     hour: "2-digit",

package/src/presentation/hooks/useSubscriptionDetails.ts

@@ -1,5 +1,9 @@
 import { useMemo } from "react";
-import type { SubscriptionStatus } from "../../domain/entities/SubscriptionStatus";
+import { 
+  type SubscriptionStatus, 
+  SUBSCRIPTION_STATUS, 
+  type SubscriptionStatusType 
+} from "../../domain/entities/SubscriptionStatus";
 import { isSubscriptionExpired } from "../../utils/dateValidationUtils";
 import { formatDateForLocale, calculateDaysRemaining } from "../utils/subscriptionDateUtils";
 
@@ -19,7 +23,7 @@ export interface SubscriptionDetails {
   /** Formatted purchase date */
   formattedPurchaseDate: string | null;
   /** Status text key for localization */
-  statusKey: "active" | "expired" | "none";
+  statusKey: SubscriptionStatusType;
 }
 
 interface UseSubscriptionDetailsParams {
@@ -45,7 +49,7 @@ export function useSubscriptionDetails(
         daysRemaining: null,
         formattedExpirationDate: null,
         formattedPurchaseDate: null,
-        statusKey: "none",
+        statusKey: SUBSCRIPTION_STATUS.NONE,
       };
     }
 
@@ -54,9 +58,15 @@ export function useSubscriptionDetails(
     const daysRemainingValue = calculateDaysRemaining(status.expiresAt ?? null);
     const isPremium = status.isPremium && !isExpired;
 
-    let statusKey: "active" | "expired" | "none" = "none";
+    let statusKey: SubscriptionStatusType = status.status || SUBSCRIPTION_STATUS.NONE;
+    
+    // Override status key based on current calculation for active/expired
     if (status.isPremium) {
-      statusKey = isExpired ? "expired" : "active";
+      statusKey = isExpired ? SUBSCRIPTION_STATUS.EXPIRED : SUBSCRIPTION_STATUS.ACTIVE;
+    } else if (status.status === SUBSCRIPTION_STATUS.CANCELED) {
+      statusKey = SUBSCRIPTION_STATUS.CANCELED;
+    } else {
+      statusKey = SUBSCRIPTION_STATUS.NONE;
     }
 
     return {

package/src/presentation/utils/subscriptionDateUtils.ts

@@ -1,7 +1,4 @@
-/**
- * Subscription Date Utilities
- * Date formatting and calculation utilities for subscription
- */
+import { timezoneService } from "@umituz/react-native-timezone";
 
 /**
  * Converts Firestore timestamp or Date to ISO string
@@ -14,11 +11,13 @@ export const convertPurchasedAt = (purchasedAt: unknown): string | null => {
     purchasedAt !== null &&
     "toDate" in purchasedAt
   ) {
-    return (purchasedAt as { toDate: () => Date }).toDate().toISOString();
+    return timezoneService.formatToISOString(
+      (purchasedAt as { toDate: () => Date }).toDate()
+    );
   }
 
   if (purchasedAt instanceof Date) {
-    return purchasedAt.toISOString();
+    return timezoneService.formatToISOString(purchasedAt);
   }
 
   return null;
@@ -34,11 +33,11 @@ export const formatDateForLocale = (
   if (!dateStr) return null;
 
   try {
-    return new Intl.DateTimeFormat(locale, {
+    return timezoneService.formatDate(new Date(dateStr), locale, {
       year: "numeric",
       month: "long",
       day: "numeric",
-    }).format(new Date(dateStr));
+    });
   } catch {
     return null;
   }
@@ -52,9 +51,11 @@ export const calculateDaysRemaining = (
 ): number | null => {
   if (!expiresAtIso) return null;
 
-  const end = new Date(expiresAtIso);
+  const expiresDate = new Date(expiresAtIso);
   const now = new Date();
-  const diff = end.getTime() - now.getTime();
-
+  
+  // Use timezoneService's mathematical approach if possible, or keep existing log
+  const diff = expiresDate.getTime() - now.getTime();
   return Math.max(0, Math.ceil(diff / (1000 * 60 * 60 * 24)));
 };
+