expo-iap 2.7.14 → 2.8.1

package/ios/ExpoIapModule.swift

@@ -22,12 +22,12 @@ struct IapEvent {
 }
 
 @available(iOS 15.0, *)
-func serializeTransaction(_ transaction: Transaction, jwsRepresentationIos: String? = nil) -> [String: Any?] {
+func serializeTransaction(_ transaction: Transaction, jwsRepresentationIOS: String? = nil) -> [String: Any?] {
     let _ =
         transaction.productType.rawValue.lowercased().contains("renewable")
         || transaction.expirationDate != nil
 
-    var transactionReasonIos: String? = nil
+    var transactionReasonIOS: String? = nil
     var webOrderLineItemId: Int? = nil
     var jsonData: [String: Any]? = nil
     var jwsReceipt: String = ""
@@ -38,7 +38,7 @@ func serializeTransaction(_ transaction: Transaction, jwsRepresentationIos: Stri
     do {
         if let jsonObj = try JSONSerialization.jsonObject(with: jsonRep) as? [String: Any] {
             jsonData = jsonObj
-            transactionReasonIos = jsonObj["transactionReason"] as? String
+            transactionReasonIOS = jsonObj["transactionReason"] as? String
             if let webOrderId = jsonObj["webOrderLineItemID"] as? NSNumber {
                 webOrderLineItemId = webOrderId.intValue
             }
@@ -56,47 +56,47 @@ func serializeTransaction(_ transaction: Transaction, jwsRepresentationIos: Stri
         "transactionReceipt": jwsReceipt,
         "platform": "ios",
 
-        "quantityIos": transaction.purchasedQuantity,
-        "originalTransactionDateIos": transaction.originalPurchaseDate.timeIntervalSince1970 * 1000,
-        "originalTransactionIdentifierIos": String(transaction.originalID),
+        "quantityIOS": transaction.purchasedQuantity,
+        "originalTransactionDateIOS": transaction.originalPurchaseDate.timeIntervalSince1970 * 1000,
+        "originalTransactionIdentifierIOS": String(transaction.originalID),
         "appAccountToken": transaction.appAccountToken?.uuidString,
 
-        "appBundleIdIos": transaction.appBundleID,
-        "productTypeIos": transaction.productType.rawValue,
-        "subscriptionGroupIdIos": transaction.subscriptionGroupID,
+        "appBundleIdIOS": transaction.appBundleID,
+        "productTypeIOS": transaction.productType.rawValue,
+        "subscriptionGroupIdIOS": transaction.subscriptionGroupID,
 
-        "webOrderLineItemIdIos": webOrderLineItemId,
+        "webOrderLineItemIdIOS": webOrderLineItemId,
 
-        "expirationDateIos": transaction.expirationDate.map { $0.timeIntervalSince1970 * 1000 },
+        "expirationDateIOS": transaction.expirationDate.map { $0.timeIntervalSince1970 * 1000 },
 
-        "isUpgradedIos": transaction.isUpgraded,
-        "ownershipTypeIos": transaction.ownershipType.rawValue,
+        "isUpgradedIOS": transaction.isUpgraded,
+        "ownershipTypeIOS": transaction.ownershipType.rawValue,
 
-        "revocationDateIos": transaction.revocationDate.map { $0.timeIntervalSince1970 * 1000 },
-        "revocationReasonIos": transaction.revocationReason?.rawValue,
-        "transactionReasonIos": transactionReasonIos,
+        "revocationDateIOS": transaction.revocationDate.map { $0.timeIntervalSince1970 * 1000 },
+        "revocationReasonIOS": transaction.revocationReason?.rawValue,
+        "transactionReasonIOS": transactionReasonIOS,
     ]
 
-    if (jwsRepresentationIos != nil) {
-        logDebug("serializeTransaction adding jwsRepresentationIos with length: \(jwsRepresentationIos!.count)")
-        purchaseMap["jwsRepresentationIos"] = jwsRepresentationIos
-        purchaseMap["purchaseToken"] = jwsRepresentationIos
+    if (jwsRepresentationIOS != nil) {
+        logDebug("serializeTransaction adding jwsRepresentationIOS with length: \(jwsRepresentationIOS!.count)")
+        purchaseMap["jwsRepresentationIOS"] = jwsRepresentationIOS
+        purchaseMap["purchaseToken"] = jwsRepresentationIOS
     } else {
-        logDebug("serializeTransaction jwsRepresentationIos is nil")
+        logDebug("serializeTransaction jwsRepresentationIOS is nil")
     }
     
     if #available(iOS 16.0, *) {
-        purchaseMap["environmentIos"] = transaction.environment.rawValue
+        purchaseMap["environmentIOS"] = transaction.environment.rawValue
     }
 
     if #available(iOS 17.0, *) {
-        purchaseMap["storefrontCountryCodeIos"] = transaction.storefront.countryCode
-        purchaseMap["reasonIos"] = transaction.reason.rawValue
+        purchaseMap["storefrontCountryCodeIOS"] = transaction.storefront.countryCode
+        purchaseMap["reasonIOS"] = transaction.reason.rawValue
     }
 
     if #available(iOS 17.2, *) {
         if let offer = transaction.offer {
-            purchaseMap["offerIos"] = [
+            purchaseMap["offerIOS"] = [
                 "id": offer.id ?? "",
                 "type": offer.type.rawValue,
                 "paymentMode": offer.paymentMode?.rawValue ?? "",
@@ -106,10 +106,26 @@ func serializeTransaction(_ transaction: Transaction, jwsRepresentationIos: Stri
 
     if #available(iOS 15.4, *), let jsonData = jsonData {
         if let price = jsonData["price"] as? NSNumber {
-            purchaseMap["priceIos"] = price.doubleValue
+            // START: Deprecated - will be removed in v2.9.0
+            // Use currencyCodeIOS, currencySymbolIOS, countryCodeIOS instead
+            purchaseMap["priceIOS"] = price.doubleValue
+            // END: Deprecated - will be removed in v2.9.0
         }
         if let currency = jsonData["currency"] as? String {
-            purchaseMap["currencyIos"] = currency
+            purchaseMap["currencyCodeIOS"] = currency
+            
+            // Try to get currency symbol from locale
+            let locale = Locale(identifier: Locale.identifier(fromComponents: [NSLocale.Key.currencyCode.rawValue: currency]))
+            purchaseMap["currencySymbolIOS"] = locale.currencySymbol
+            
+            // START: Deprecated - will be removed in v2.9.0
+            // Use currencyCodeIOS instead
+            purchaseMap["currencyIOS"] = currency
+            // END: Deprecated - will be removed in v2.9.0
+        }
+        // Extract country code from storefront if available
+        if let storefront = jsonData["storefront"] as? String {
+            purchaseMap["countryCodeIOS"] = storefront
         }
     }
 
@@ -118,7 +134,7 @@ func serializeTransaction(_ transaction: Transaction, jwsRepresentationIos: Stri
 
 private let DEFAULT_SUBSCRIPTION_PERIOD_UNIT = "DAY" // Default fallback unit for subscription periods.
 
-func getPeriodIos(_ unit: Product.SubscriptionPeriod.Unit) -> String {
+func getPeriodIOS(_ unit: Product.SubscriptionPeriod.Unit) -> String {
     return switch (unit) {
     case .day: "DAY"
     case .week: "WEEK"
@@ -135,7 +151,7 @@ func serializeOffer(_ offer: Product.SubscriptionOffer?) -> [String: Any?]? {
     return [
         "id": offer.id,
         "period": [
-            "unit": getPeriodIos(offer.period.unit),
+            "unit": getPeriodIOS(offer.period.unit),
             "value": offer.period.value
         ],
         "periodCount": offer.periodCount,
@@ -151,9 +167,9 @@ func serializeSubscription(_ s: Product.SubscriptionInfo?) -> [String: Any?]? {
     return [
         "introductoryOffer": serializeOffer(s.introductoryOffer),
         "promotionalOffers": s.promotionalOffers.map(serializeOffer),
-        "subscriptionGroupID": s.subscriptionGroupID,
+        "subscriptionGroupId": s.subscriptionGroupID,
         "subscriptionPeriod": [
-            "unit": getPeriodIos(s.subscriptionPeriod.unit),
+            "unit": getPeriodIOS(s.subscriptionPeriod.unit),
             "value": s.subscriptionPeriod.value
         ],
     ]
@@ -162,20 +178,86 @@ func serializeSubscription(_ s: Product.SubscriptionInfo?) -> [String: Any?]? {
 
 @available(iOS 15.0, *)
 func serializeProduct(_ p: Product) -> [String: Any?] {
+    // Convert Product.ProductType to our expected 'inapp' or 'subs' string
+    let productType: String = p.subscription != nil ? "subs" : "inapp"
+    
+    // For subscription products, add discounts and introductory price
+    var discounts: [[String: Any?]]? = nil
+    var introductoryPrice: String? = nil
+    var introductoryPriceAsAmountIOS: String? = nil
+    var introductoryPricePaymentModeIOS: String? = nil
+    var introductoryPriceNumberOfPeriodsIOS: String? = nil
+    var introductoryPriceSubscriptionPeriodIOS: String? = nil
+    var subscriptionPeriodNumberIOS: String? = nil
+    var subscriptionPeriodUnitIOS: String? = nil
+    
+    if let subscription = p.subscription {
+        // Extract discount information from promotional offers
+        if !subscription.promotionalOffers.isEmpty {
+            discounts = subscription.promotionalOffers.compactMap { offer in
+                return [
+                    "identifier": offer.id ?? "",
+                    "type": offer.type.rawValue,
+                    "numberOfPeriods": "\(offer.periodCount)",
+                    "price": "\(offer.price)",
+                    "localizedPrice": offer.displayPrice,
+                    "paymentMode": offer.paymentMode.rawValue,
+                    "subscriptionPeriod": getPeriodIOS(offer.period.unit)
+                ]
+            }
+        }
+        
+        // Extract introductory price from introductory offer
+        if let introOffer = subscription.introductoryOffer {
+            introductoryPrice = introOffer.displayPrice
+            introductoryPriceAsAmountIOS = "\(introOffer.price)"
+            introductoryPricePaymentModeIOS = introOffer.paymentMode.rawValue
+            introductoryPriceNumberOfPeriodsIOS = "\(introOffer.periodCount)"
+            introductoryPriceSubscriptionPeriodIOS = getPeriodIOS(introOffer.period.unit)
+        }
+        
+        // Extract subscription period information
+        subscriptionPeriodNumberIOS = "\(subscription.subscriptionPeriod.value)"
+        subscriptionPeriodUnitIOS = getPeriodIOS(subscription.subscriptionPeriod.unit)
+    }
+    
     return [
         "debugDescription": serializeDebug(p.debugDescription),
         "description": p.description,
-        "displayName": p.displayName,
+        // New iOS-suffixed fields
+        "displayNameIOS": p.displayName,
+        "discountsIOS": discounts,
+        "introductoryPriceIOS": introductoryPrice,
+        "introductoryPriceAsAmountIOS": introductoryPriceAsAmountIOS,
+        "introductoryPricePaymentModeIOS": introductoryPricePaymentModeIOS,
+        "introductoryPriceNumberOfPeriodsIOS": introductoryPriceNumberOfPeriodsIOS,
+        "introductoryPriceSubscriptionPeriodIOS": introductoryPriceSubscriptionPeriodIOS,
+        "subscriptionPeriodNumberIOS": subscriptionPeriodNumberIOS,
+        "subscriptionPeriodUnitIOS": subscriptionPeriodUnitIOS,
         "displayPrice": p.displayPrice,
         "id": p.id,
         "title": p.displayName,
-        "isFamilyShareable": p.isFamilyShareable,
-        "jsonRepresentation": String(data: p.jsonRepresentation, encoding: .utf8),
+        "isFamilyShareableIOS": p.isFamilyShareable,
+        "jsonRepresentationIOS": String(data: p.jsonRepresentation, encoding: .utf8),
         "price": p.price,
-        "subscription": serializeSubscription(p.subscription),
-        "type": p.type,
+        "subscriptionInfoIOS": serializeSubscription(p.subscription),
+        "type": productType,
         "currency": p.priceFormatStyle.currencyCode,
         "platform": "ios",
+        // START: Deprecated - will be removed in v2.9.0
+        // Use displayNameIOS instead of displayName
+        "displayName": p.displayName,
+        // Use discountsIOS instead of discounts
+        "discounts": discounts,
+        // Use introductoryPriceIOS instead of introductoryPrice
+        "introductoryPrice": introductoryPrice,
+        // Use isFamilyShareableIOS instead of isFamilyShareable
+        "isFamilyShareable": p.isFamilyShareable,
+        // Use jsonRepresentationIOS instead of jsonRepresentation
+        "jsonRepresentation": String(data: p.jsonRepresentation, encoding: .utf8),
+        // Use subscriptionInfoIOS instead of subscription
+        "subscription": serializeSubscription(p.subscription),
+        // END: Deprecated - will be removed in v2.9.0
     ]
 }
 
@@ -290,7 +372,7 @@ public class ExpoIapModule: Module {
                 }
                 
                 var result: [String: Any?] = [
-                    "bundleID": appTransaction.bundleID,
+                    "bundleId": appTransaction.bundleID,
                     "appVersion": appTransaction.appVersion,
                     "originalAppVersion": appTransaction.originalAppVersion,
                     "originalPurchaseDate": appTransaction.originalPurchaseDate.timeIntervalSince1970 * 1000,
@@ -298,13 +380,13 @@ public class ExpoIapModule: Module {
                     "deviceVerificationNonce": appTransaction.deviceVerificationNonce.uuidString,
                     "environment": appTransaction.environment.rawValue,
                     "signedDate": appTransaction.signedDate.timeIntervalSince1970 * 1000,
-                    "appID": appTransaction.appID,
-                    "appVersionID": appTransaction.appVersionID,
+                    "appId": appTransaction.appID,
+                    "appVersionId": appTransaction.appVersionID,
                     "preorderDate": appTransaction.preorderDate.map { $0.timeIntervalSince1970 * 1000 }
                 ]
                 
                 if #available(iOS 18.4, *) {
-                    result["appTransactionID"] = appTransaction.appTransactionID
+                    result["appTransactionId"] = appTransaction.appTransactionID
                     result["originalPlatform"] = appTransaction.originalPlatform.rawValue
                 }
                 
@@ -393,8 +475,8 @@ public class ExpoIapModule: Module {
             
             var purchasedItemsSerialized: [[String: Any?]] = []
 
-            func addTransaction(transaction: Transaction, jwsRepresentationIos: String? = nil) {
-                let serialized = serializeTransaction(transaction, jwsRepresentationIos: jwsRepresentationIos)
+            func addTransaction(transaction: Transaction, jwsRepresentationIOS: String? = nil) {
+                let serialized = serializeTransaction(transaction, jwsRepresentationIOS: jwsRepresentationIOS)
                 purchasedItemsSerialized.append(serialized)
                 
                 if alsoPublishToEventListener {
@@ -408,7 +490,7 @@ public class ExpoIapModule: Module {
                 do {
                     let transaction = try self.checkVerified(verification)
                     if !onlyIncludeActiveItems {
-                        addTransaction(transaction: transaction, jwsRepresentationIos: verification.jwsRepresentation)
+                        addTransaction(transaction: transaction, jwsRepresentationIOS: verification.jwsRepresentation)
                         continue
                     }
                     switch transaction.productType {
@@ -416,7 +498,7 @@ public class ExpoIapModule: Module {
                         if await self.productStore?.getProduct(productID: transaction.productID)
                             != nil
                         {
-                            addTransaction(transaction: transaction, jwsRepresentationIos: verification.jwsRepresentation)
+                            addTransaction(transaction: transaction, jwsRepresentationIOS: verification.jwsRepresentation)
                         }
                     case .nonRenewable:
                         if await self.productStore?.getProduct(productID: transaction.productID)
@@ -426,7 +508,7 @@ public class ExpoIapModule: Module {
                             let expirationDate = Calendar(identifier: .gregorian).date(
                                 byAdding: DateComponents(year: 1), to: transaction.purchaseDate)!
                             if currentDate < expirationDate {
-                                addTransaction(transaction: transaction, jwsRepresentationIos: verification.jwsRepresentation)
+                                addTransaction(transaction: transaction, jwsRepresentationIOS: verification.jwsRepresentation)
                             }
                         }
                     default:
@@ -537,10 +619,10 @@ public class ExpoIapModule: Module {
                             return nil
                         } else {
                             self.transactions[String(transaction.id)] = transaction
-                            let serialized = serializeTransaction(transaction, jwsRepresentationIos: verification.jwsRepresentation)
+                            let serialized = serializeTransaction(transaction, jwsRepresentationIOS: verification.jwsRepresentation)
                             
-                            // Debug: Check if jwsRepresentationIos is included in serialized result
-                            logDebug("buyProduct serialized includes JWS: \(serialized["jwsRepresentationIos"] != nil)")
+                            // Debug: Check if jwsRepresentationIOS is included in serialized result
+                            logDebug("buyProduct serialized includes JWS: \(serialized["jwsRepresentationIOS"] != nil)")
                             
                             self.sendEvent(IapEvent.PurchaseUpdated, serialized)
                             return serialized
@@ -888,7 +970,7 @@ public class ExpoIapModule: Module {
                     // If this doesn't throw, the transaction is verified
                     let transaction = try self.checkVerified(result)
                     isValid = true
-                    latestTransaction = serializeTransaction(transaction, jwsRepresentationIos: result.jwsRepresentation)
+                    latestTransaction = serializeTransaction(transaction, jwsRepresentationIOS: result.jwsRepresentation)
                 } catch {
                     isValid = false
                 }
@@ -974,7 +1056,7 @@ public class ExpoIapModule: Module {
                     let transaction = try self.checkVerified(result)
                     self.transactions[String(transaction.id)] = transaction
                     if self.hasListeners {
-                        let serialized = serializeTransaction(transaction, jwsRepresentationIos: result.jwsRepresentation)
+                        let serialized = serializeTransaction(transaction, jwsRepresentationIOS: result.jwsRepresentation)
                         self.sendEvent(IapEvent.PurchaseUpdated, serialized)
                     }
                 } catch {
@@ -1076,7 +1158,7 @@ public class ExpoIapModule: Module {
                        previousWillAutoRenew != currentWillAutoRenew {
                         
                         // Use the jwsRepresentation when serializing the transaction
-                        var purchaseMap = serializeTransaction(transaction, jwsRepresentationIos: result.jwsRepresentation)
+                        var purchaseMap = serializeTransaction(transaction, jwsRepresentationIOS: result.jwsRepresentation)
                         
                         if case .verified(let renewalInfo) = status.renewalInfo {
                             if let renewalInfoDict = serializeRenewalInfo(.verified(renewalInfo)) {

package/jest.config.js

@@ -0,0 +1,43 @@
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  roots: ['<rootDir>/src'],
+  testMatch: [
+    '**/__tests__/**/*.+(ts|tsx|js)',
+    '**/?(*.)+(spec|test).+(ts|tsx|js)',
+  ],
+  transform: {
+    '^.+\\.(ts|tsx)$': [
+      'ts-jest',
+      {
+        tsconfig: {
+          jsx: 'react',
+          esModuleInterop: true,
+          allowSyntheticDefaultImports: true,
+          moduleResolution: 'node',
+          skipLibCheck: true,
+        },
+      },
+    ],
+  },
+  moduleNameMapper: {
+    '^react-native$': '<rootDir>/src/__mocks__/react-native.js',
+    '^expo-modules-core$': '<rootDir>/src/__mocks__/expo-modules-core.js',
+  },
+  collectCoverageFrom: [
+    'src/**/*.{ts,tsx}',
+    '!src/**/*.d.ts',
+    '!src/**/__tests__/**',
+    '!src/**/__mocks__/**',
+    '!src/ExpoIapModule.ts',
+    '!src/ExpoIapModule.web.ts',
+  ],
+  coverageThreshold: {
+    global: {
+      branches: 15,
+      functions: 15,
+      lines: 15,
+      statements: 15,
+    },
+  },
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-iap",
-  "version": "2.7.14",
+  "version": "2.8.1",
   "description": "In App Purchase module in Expo",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -12,6 +12,8 @@
     "lint:prettier": "prettier --write \"**/*.{md,js,jsx,ts,tsx}\"",
     "lint:tsc": "tsc -p tsconfig.json --noEmit --skipLibCheck",
     "lint:ci": "bun run lint:tsc && bun run lint:eslint && bun run lint:prettier",
+    "test": "jest",
+    "test:coverage": "jest --coverage",
     "prepare": "expo-module prepare",
     "expo-module": "expo-module",
     "open:ios": "xed example/ios",
@@ -38,15 +40,18 @@
   "author": "hyochan <hyochan.dev@gmail.com> (https://github.com/hyochan)",
   "license": "MIT",
   "homepage": "https://github.com/hyochan/expo-iap#readme",
-  "dependencies": {},
   "devDependencies": {
+    "@jest/globals": "^30.0.5",
+    "@types/jest": "^30.0.0",
     "@types/react": "~19.1.7",
     "eslint": "8.57.0",
     "eslint-config-expo": "^9.2.0",
     "eslint-config-prettier": "^10.1.5",
     "eslint-plugin-prettier": "^5.4.1",
     "expo-module-scripts": "^4.1.7",
-    "expo-modules-core": "^2.4.0"
+    "expo-modules-core": "^2.4.0",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.4.1"
   },
   "peerDependencies": {
     "expo": "*",

package/src/ExpoIap.types.ts

@@ -1,13 +1,13 @@
 import {
   ProductAndroid,
   ProductPurchaseAndroid,
-  SubscriptionProductAndroid,
+  ProductSubscriptionAndroid,
 } from './types/ExpoIapAndroid.types';
 import {
-  ProductIos,
-  ProductPurchaseIos,
-  SubscriptionProductIos,
-} from './types/ExpoIapIos.types';
+  ProductIOS,
+  ProductPurchaseIOS,
+  ProductSubscriptionIOS,
+} from './types/ExpoIapIOS.types';
 import {NATIVE_ERROR_CODES} from './ExpoIapModule';
 
 export type ChangeEventPayload = {
@@ -16,7 +16,11 @@ export type ChangeEventPayload = {
 
 export type ProductType = 'inapp' | 'subs';
 
-export type ProductBase = {
+// =============================================================================
+// COMMON TYPES (Base types shared across all platforms)
+// =============================================================================
+
+export type ProductCommon = {
   id: string;
   title: string;
   description: string;
@@ -25,15 +29,23 @@ export type ProductBase = {
   displayPrice: string;
   currency: string;
   price?: number;
+  debugDescription?: string;
+  platform?: string;
 };
 
-export type PurchaseBase = {
+export type PurchaseCommon = {
   id: string; // Transaction identifier - used by finishTransaction
   productId: string; // Product identifier - which product was purchased
+  ids?: string[]; // Product identifiers for purchases that include multiple products
   transactionId?: string; // @deprecated - use id instead
   transactionDate: number;
   transactionReceipt: string;
   purchaseToken?: string; // Unified purchase token (jwsRepresentation for iOS, purchaseToken for Android)
+  platform?: string;
+};
+
+export type ProductSubscriptionCommon = ProductCommon & {
+  type: 'subs';
 };
 
 // Define literal platform types for better type discrimination
@@ -43,33 +55,38 @@ export type AndroidPlatform = {platform: 'android'};
 // Platform-agnostic unified product types (public API)
 export type Product =
   | (ProductAndroid & AndroidPlatform)
-  | (ProductIos & IosPlatform);
+  | (ProductIOS & IosPlatform);
 
 export type SubscriptionProduct =
-  | (SubscriptionProductAndroid & AndroidPlatform)
-  | (SubscriptionProductIos & IosPlatform);
-
-// ============================================================================
-// Legacy Types (For backward compatibility with useIap hook)
-// ============================================================================
-
-// Re-export platform-specific purchase types for legacy compatibility
-export type {ProductPurchaseAndroid} from './types/ExpoIapAndroid.types';
-export type {ProductPurchaseIos} from './types/ExpoIapIos.types';
+  | (ProductSubscriptionAndroid & AndroidPlatform)
+  | (ProductSubscriptionIOS & IosPlatform);
 
-// Union type for platform-specific purchase types (legacy support)
+// Re-export platform-specific types
+export type {
+  ProductPurchaseAndroid,
+  PurchaseAndroid,
+  ProductSubscriptionAndroid,
+  SubscriptionProductAndroid, // Legacy
+} from './types/ExpoIapAndroid.types';
+export type {
+  ProductPurchaseIOS,
+  PurchaseIOS,
+  ProductSubscriptionIOS,
+  SubscriptionProductIOS, // Legacy
+} from './types/ExpoIapIOS.types';
+
+// Union type for platform-specific purchase types
 export type ProductPurchase =
   | (ProductPurchaseAndroid & AndroidPlatform)
-  | (ProductPurchaseIos & IosPlatform);
+  | (ProductPurchaseIOS & IosPlatform);
 
-// Union type for platform-specific subscription purchase types (legacy support)
+// Union type for platform-specific subscription purchase types
 export type SubscriptionPurchase =
   | (ProductPurchaseAndroid & AndroidPlatform & {autoRenewingAndroid: boolean})
-  | (ProductPurchaseIos & IosPlatform);
+  | (ProductPurchaseIOS & IosPlatform);
 
 export type Purchase = ProductPurchase | SubscriptionPurchase;
 
-// Legacy result type
 export type PurchaseResult = {
   responseCode?: number;
   debugMessage?: string;
@@ -305,10 +322,10 @@ export interface UnifiedRequestPurchaseProps {
   readonly skus?: string[]; // Multiple SKUs (Android native, iOS uses first item)
 
   // iOS-specific properties (ignored on Android)
-  readonly andDangerouslyFinishTransactionAutomaticallyIOS?: boolean;
+  readonly andDangerouslyFinishTransactionAutomatically?: boolean;
   readonly appAccountToken?: string;
   readonly quantity?: number;
-  readonly withOffer?: import('./types/ExpoIapIos.types').PaymentDiscount;
+  readonly withOffer?: import('./types/ExpoIapIOS.types').PaymentDiscount;
 
   // Android-specific properties (ignored on iOS)
   readonly obfuscatedAccountIdAndroid?: string;
@@ -325,10 +342,10 @@ export interface UnifiedRequestPurchaseProps {
  */
 export interface RequestPurchaseIosProps {
   readonly sku: string;
-  readonly andDangerouslyFinishTransactionAutomaticallyIOS?: boolean;
+  readonly andDangerouslyFinishTransactionAutomatically?: boolean;
   readonly appAccountToken?: string;
   readonly quantity?: number;
-  readonly withOffer?: import('./types/ExpoIapIos.types').PaymentDiscount;
+  readonly withOffer?: import('./types/ExpoIapIOS.types').PaymentDiscount;
 }
 
 /**
@@ -382,5 +399,3 @@ export type RequestPurchaseProps = RequestPurchasePropsByPlatforms;
  * This is the recommended API moving forward
  */
 export type RequestSubscriptionProps = RequestSubscriptionPropsByPlatforms;
-
-// Note: Type guard functions are exported from index.ts to avoid conflicts

package/src/helpers/subscription.ts

@@ -28,15 +28,16 @@ export const getActiveSubscriptions = async (
     const filteredPurchases = purchases.filter((purchase) => {
       // If specific IDs provided, filter by them
       if (subscriptionIds && subscriptionIds.length > 0) {
-        if (!subscriptionIds.includes(purchase.id)) {
+        if (!subscriptionIds.includes(purchase.productId)) {
           return false;
         }
       }
 
       // Check if this purchase has subscription-specific fields
       const hasSubscriptionFields =
-        ('expirationDateIos' in purchase && purchase.expirationDateIos) ||
-        'autoRenewingAndroid' in purchase;
+        ('expirationDateIOS' in purchase && purchase.expirationDateIOS) ||
+        'autoRenewingAndroid' in purchase ||
+        ('environmentIOS' in purchase && purchase.environmentIOS === 'Sandbox');
 
       if (!hasSubscriptionFields) {
         return false;
@@ -44,19 +45,25 @@ export const getActiveSubscriptions = async (
 
       // Check if it's actually active
       if (Platform.OS === 'ios') {
-        if ('expirationDateIos' in purchase && purchase.expirationDateIos) {
-          return purchase.expirationDateIos > currentTime;
+        if ('expirationDateIOS' in purchase && purchase.expirationDateIOS) {
+          return purchase.expirationDateIOS > currentTime;
         }
-        if (
-          'environmentIos' in purchase &&
-          purchase.environmentIos === 'Sandbox'
-        ) {
+        // For iOS purchases without expiration date (like Sandbox), we consider them active
+        // if they have the environmentIOS field and were created recently
+        if ('environmentIOS' in purchase && purchase.environmentIOS) {
           const dayInMs = 24 * 60 * 60 * 1000;
+          // If no expiration date, consider active if transaction is recent (within 24 hours for Sandbox)
           if (
-            purchase.transactionDate &&
-            currentTime - purchase.transactionDate < dayInMs
+            !('expirationDateIOS' in purchase) ||
+            !purchase.expirationDateIOS
           ) {
-            return true;
+            if (
+              purchase.environmentIOS === 'Sandbox' &&
+              purchase.transactionDate &&
+              currentTime - purchase.transactionDate < dayInMs
+            ) {
+              return true;
+            }
           }
         }
       } else if (Platform.OS === 'android') {
@@ -70,26 +77,26 @@ export const getActiveSubscriptions = async (
     // Convert to ActiveSubscription format
     for (const purchase of filteredPurchases) {
       const subscription: ActiveSubscription = {
-        productId: purchase.id,
+        productId: purchase.productId,
         isActive: true,
       };
 
       // Add platform-specific details
       if (Platform.OS === 'ios') {
-        if ('expirationDateIos' in purchase && purchase.expirationDateIos) {
-          const expirationDate = new Date(purchase.expirationDateIos);
+        if ('expirationDateIOS' in purchase && purchase.expirationDateIOS) {
+          const expirationDate = new Date(purchase.expirationDateIOS);
           subscription.expirationDateIOS = expirationDate;
 
-          // Calculate days until expiration
-          const daysUntilExpiration = Math.floor(
-            (purchase.expirationDateIos - currentTime) / (1000 * 60 * 60 * 24),
+          // Calculate days until expiration (round to nearest day)
+          const daysUntilExpiration = Math.round(
+            (purchase.expirationDateIOS - currentTime) / (1000 * 60 * 60 * 24),
           );
           subscription.daysUntilExpirationIOS = daysUntilExpiration;
           subscription.willExpireSoon = daysUntilExpiration <= 7;
         }
 
-        if ('environmentIos' in purchase) {
-          subscription.environmentIOS = purchase.environmentIos;
+        if ('environmentIOS' in purchase) {
+          subscription.environmentIOS = purchase.environmentIOS;
         }
       } else if (Platform.OS === 'android') {
         if ('autoRenewingAndroid' in purchase) {