expo-iap 2.9.0-rc.3 → 2.9.0

package/jest.config.js

@@ -1,21 +1,26 @@
 module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
+  // Disable watchman to avoid sandbox/permission issues in CI and sandboxes
+  watchman: false,
   roots: ['<rootDir>/src'],
   testMatch: [
     '**/__tests__/**/*.+(ts|tsx|js)',
-    '**/?(*.)+(spec|test).+(ts|tsx|js)'
+    '**/?(*.)+(spec|test).+(ts|tsx|js)',
   ],
   transform: {
-    '^.+\\.(ts|tsx)$': ['ts-jest', {
-      tsconfig: {
-        jsx: 'react',
-        esModuleInterop: true,
-        allowSyntheticDefaultImports: true,
-        moduleResolution: 'node',
-        skipLibCheck: true,
-      }
-    }]
+    '^.+\\.(ts|tsx)$': [
+      'ts-jest',
+      {
+        tsconfig: {
+          jsx: 'react',
+          esModuleInterop: true,
+          allowSyntheticDefaultImports: true,
+          moduleResolution: 'node',
+          skipLibCheck: true,
+        },
+      },
+    ],
   },
   moduleNameMapper: {
     '^react-native$': '<rootDir>/src/__mocks__/react-native.js',
@@ -34,7 +39,7 @@ module.exports = {
       branches: 15,
       functions: 15,
       lines: 15,
-      statements: 15
-    }
-  }
-};
+      statements: 15,
+    },
+  },
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-iap",
-  "version": "2.9.0-rc.3",
+  "version": "2.9.0",
   "description": "In App Purchase module in Expo",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -61,6 +61,5 @@
   },
   "expo": {
     "plugin": "./app.plugin.js"
-  },
-  "packageManager": "yarn@3.6.1+sha512.de524adec81a6c3d7a26d936d439d2832e351cdfc5728f9d91f3fc85dd20b04391c038e9b4ecab11cae2b0dd9f0d55fd355af766bc5c1a7f8d25d96bb2a0b2ca"
+  }
 }

package/plugin/build/withIAP.js

@@ -41,8 +41,16 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const withLocalOpenIAP_1 = __importDefault(require("./withLocalOpenIAP"));
 const pkg = require('../../package.json');
-// Global flag to prevent duplicate logs
-let hasLoggedPluginExecution = false;
+// Log a message only once per Node process
+const logOnce = (() => {
+    const printed = new Set();
+    return (msg) => {
+        if (!printed.has(msg)) {
+            console.log(msg);
+            printed.add(msg);
+        }
+    };
+})();
 const addLineToGradle = (content, anchor, lineToAdd, offset = 1) => {
     const lines = content.split('\n');
     const index = lines.findIndex((line) => line.match(anchor));
@@ -70,9 +78,8 @@ const modifyAppBuildGradle = (gradle) => {
         hasAddedDependency = true;
     }
     // Log only once and only if we actually added dependencies
-    if (hasAddedDependency && !hasLoggedPluginExecution) {
-        console.log('🛠️ expo-iap: Added billing dependencies to build.gradle');
-    }
+    if (hasAddedDependency)
+        logOnce('🛠️ expo-iap: Added billing dependencies to build.gradle');
     return modified;
 };
 const withIapAndroid = (config) => {
@@ -91,14 +98,10 @@ const withIapAndroid = (config) => {
         const alreadyExists = permissions.some((p) => p.$['android:name'] === 'com.android.vending.BILLING');
         if (!alreadyExists) {
             permissions.push(billingPerm);
-            if (!hasLoggedPluginExecution) {
-                console.log('✅ Added com.android.vending.BILLING to AndroidManifest.xml');
-            }
+            logOnce('✅ Added com.android.vending.BILLING to AndroidManifest.xml');
         }
         else {
-            if (!hasLoggedPluginExecution) {
-                console.log('ℹ️ com.android.vending.BILLING already exists in AndroidManifest.xml');
-            }
+            logOnce('ℹ️ com.android.vending.BILLING already exists in AndroidManifest.xml');
         }
         return config;
     });
@@ -119,17 +122,13 @@ const withIapIOS = (config) => {
             const cdnLine = `source 'https://cdn.cocoapods.org/'`;
             if (!content.includes(cdnLine)) {
                 content = `${cdnLine}\n\n${content}`;
-                if (!hasLoggedPluginExecution) {
-                    console.log('📦 expo-iap: Added CocoaPods CDN source to Podfile');
-                }
+                logOnce('📦 expo-iap: Added CocoaPods CDN source to Podfile');
             }
             // 2) Remove any lingering local OpenIAP pod injection
             const localPodRegex = /^\s*pod\s+'openiap'\s*,\s*:path\s*=>\s*['"][^'"]+['"][^\n]*$/gm;
             if (localPodRegex.test(content)) {
                 content = content.replace(localPodRegex, '').replace(/\n{3,}/g, '\n\n');
-                if (!hasLoggedPluginExecution) {
-                    console.log('🧹 expo-iap: Removed local OpenIAP pod from Podfile');
-                }
+                logOnce('🧹 expo-iap: Removed local OpenIAP pod from Podfile');
             }
             fs.writeFileSync(podfilePath, content);
             return config;
@@ -142,17 +141,20 @@ const withIap = (config, options) => {
         let result = withIapAndroid(config);
         // iOS: choose one path to avoid overlap
         if (options?.enableLocalDev || options?.localPath) {
-            const localPath = options.localPath || '/Users/crossplatformkorea/Github/hyodotdev/openiap-apple';
-            console.log(`🔧 [expo-iap] Enabling local OpenIAP development at: ${localPath}`);
-            result = (0, withLocalOpenIAP_1.default)(result, { localPath });
+            if (!options?.localPath) {
+                config_plugins_1.WarningAggregator.addWarningIOS('expo-iap', 'enableLocalDev is true but no localPath provided. Skipping local OpenIAP integration.');
+            }
+            else {
+                const localPath = path.resolve(options.localPath);
+                logOnce(`🔧 [expo-iap] Enabling local OpenIAP development at: ${localPath}`);
+                result = (0, withLocalOpenIAP_1.default)(result, { localPath });
+            }
         }
         else {
             // Ensure iOS Podfile is set up to resolve public CocoaPods specs
             result = withIapIOS(result);
-            console.log('📦 [expo-iap] Using OpenIAP from CocoaPods');
+            logOnce('📦 [expo-iap] Using OpenIAP from CocoaPods');
         }
-        // Set flag after first execution to prevent duplicate logs
-        hasLoggedPluginExecution = true;
         return result;
     }
     catch (error) {

package/plugin/build/withLocalOpenIAP.js

@@ -48,7 +48,7 @@ const withLocalOpenIAP = (config, props) => {
             const podfilePath = path.join(platformProjectRoot, 'Podfile');
             // Default local path or use provided one
             const localOpenIapPath = props?.localPath ||
-                '/Users/crossplatformkorea/Github/hyodotdev/openiap-apple';
+                path.resolve(config.modRequest.projectRoot, 'openiap-apple');
             // Check if local path exists
             if (!fs.existsSync(localOpenIapPath)) {
                 console.warn(`⚠️  Local openiap-apple path not found: ${localOpenIapPath}`);
@@ -56,6 +56,10 @@ const withLocalOpenIAP = (config, props) => {
                 return config;
             }
             // Read Podfile
+            if (!fs.existsSync(podfilePath)) {
+                console.warn(`⚠️  Podfile not found at ${podfilePath}. Skipping.`);
+                return config;
+            }
             let podfileContent = fs.readFileSync(podfilePath, 'utf8');
             // Check if already has the local pod reference
             if (podfileContent.includes("pod 'openiap',")) {

package/plugin/src/withIAP.ts

@@ -12,8 +12,16 @@ import withLocalOpenIAP from './withLocalOpenIAP';
 
 const pkg = require('../../package.json');
 
-// Global flag to prevent duplicate logs
-let hasLoggedPluginExecution = false;
+// Log a message only once per Node process
+const logOnce = (() => {
+  const printed = new Set<string>();
+  return (msg: string) => {
+    if (!printed.has(msg)) {
+      console.log(msg);
+      printed.add(msg);
+    }
+  };
+})();
 
 const addLineToGradle = (
   content: string,
@@ -53,9 +61,8 @@ const modifyAppBuildGradle = (gradle: string): string => {
   }
 
   // Log only once and only if we actually added dependencies
-  if (hasAddedDependency && !hasLoggedPluginExecution) {
-    console.log('🛠️ expo-iap: Added billing dependencies to build.gradle');
-  }
+  if (hasAddedDependency)
+    logOnce('🛠️ expo-iap: Added billing dependencies to build.gradle');
 
   return modified;
 };
@@ -83,17 +90,11 @@ const withIapAndroid: ConfigPlugin = (config) => {
     );
     if (!alreadyExists) {
       permissions.push(billingPerm);
-      if (!hasLoggedPluginExecution) {
-        console.log(
-          '✅ Added com.android.vending.BILLING to AndroidManifest.xml',
-        );
-      }
+      logOnce('✅ Added com.android.vending.BILLING to AndroidManifest.xml');
     } else {
-      if (!hasLoggedPluginExecution) {
-        console.log(
-          'ℹ️ com.android.vending.BILLING already exists in AndroidManifest.xml',
-        );
-      }
+      logOnce(
+        'ℹ️ com.android.vending.BILLING already exists in AndroidManifest.xml',
+      );
     }
 
     return config;
@@ -107,7 +108,7 @@ const withIapIOS: ConfigPlugin = (config) => {
   return withDangerousMod(config, [
     'ios',
     async (config) => {
-      const { platformProjectRoot } = config.modRequest;
+      const {platformProjectRoot} = config.modRequest;
       const podfilePath = path.join(platformProjectRoot, 'Podfile');
 
       if (!fs.existsSync(podfilePath)) {
@@ -120,18 +121,15 @@ const withIapIOS: ConfigPlugin = (config) => {
       const cdnLine = `source 'https://cdn.cocoapods.org/'`;
       if (!content.includes(cdnLine)) {
         content = `${cdnLine}\n\n${content}`;
-        if (!hasLoggedPluginExecution) {
-          console.log('📦 expo-iap: Added CocoaPods CDN source to Podfile');
-        }
+        logOnce('📦 expo-iap: Added CocoaPods CDN source to Podfile');
       }
 
       // 2) Remove any lingering local OpenIAP pod injection
-      const localPodRegex = /^\s*pod\s+'openiap'\s*,\s*:path\s*=>\s*['"][^'"]+['"][^\n]*$/gm;
+      const localPodRegex =
+        /^\s*pod\s+'openiap'\s*,\s*:path\s*=>\s*['"][^'"]+['"][^\n]*$/gm;
       if (localPodRegex.test(content)) {
         content = content.replace(localPodRegex, '').replace(/\n{3,}/g, '\n\n');
-        if (!hasLoggedPluginExecution) {
-          console.log('🧹 expo-iap: Removed local OpenIAP pod from Podfile');
-        }
+        logOnce('🧹 expo-iap: Removed local OpenIAP pod from Podfile');
       }
 
       fs.writeFileSync(podfilePath, content);
@@ -147,24 +145,34 @@ export interface ExpoIapPluginOptions {
   enableLocalDev?: boolean;
 }
 
-const withIap: ConfigPlugin<ExpoIapPluginOptions | void> = (config, options) => {
+const withIap: ConfigPlugin<ExpoIapPluginOptions | void> = (
+  config,
+  options,
+) => {
   try {
     // Apply Android modifications
     let result = withIapAndroid(config);
 
     // iOS: choose one path to avoid overlap
     if (options?.enableLocalDev || options?.localPath) {
-      const localPath = options.localPath || '/Users/crossplatformkorea/Github/hyodotdev/openiap-apple';
-      console.log(`🔧 [expo-iap] Enabling local OpenIAP development at: ${localPath}`);
-      result = withLocalOpenIAP(result, { localPath });
+      if (!options?.localPath) {
+        WarningAggregator.addWarningIOS(
+          'expo-iap',
+          'enableLocalDev is true but no localPath provided. Skipping local OpenIAP integration.',
+        );
+      } else {
+        const localPath = path.resolve(options.localPath);
+        logOnce(
+          `🔧 [expo-iap] Enabling local OpenIAP development at: ${localPath}`,
+        );
+        result = withLocalOpenIAP(result, {localPath});
+      }
     } else {
       // Ensure iOS Podfile is set up to resolve public CocoaPods specs
       result = withIapIOS(result);
-      console.log('📦 [expo-iap] Using OpenIAP from CocoaPods');
+      logOnce('📦 [expo-iap] Using OpenIAP from CocoaPods');
     }
-    
-    // Set flag after first execution to prevent duplicate logs
-    hasLoggedPluginExecution = true;
+
     return result;
   } catch (error) {
     WarningAggregator.addWarningAndroid(

package/plugin/src/withLocalOpenIAP.ts

@@ -19,11 +19,13 @@ const withLocalOpenIAP: ConfigPlugin<{localPath?: string} | void> = (
       // Default local path or use provided one
       const localOpenIapPath =
         props?.localPath ||
-        '/Users/crossplatformkorea/Github/hyodotdev/openiap-apple';
+        path.resolve(config.modRequest.projectRoot, 'openiap-apple');
 
       // Check if local path exists
       if (!fs.existsSync(localOpenIapPath)) {
-        console.warn(`⚠️  Local openiap-apple path not found: ${localOpenIapPath}`);
+        console.warn(
+          `⚠️  Local openiap-apple path not found: ${localOpenIapPath}`,
+        );
         console.warn(
           '   Skipping local pod injection. Using default pod resolution.',
         );
@@ -31,6 +33,10 @@ const withLocalOpenIAP: ConfigPlugin<{localPath?: string} | void> = (
       }
 
       // Read Podfile
+      if (!fs.existsSync(podfilePath)) {
+        console.warn(`⚠️  Podfile not found at ${podfilePath}. Skipping.`);
+        return config;
+      }
       let podfileContent = fs.readFileSync(podfilePath, 'utf8');
 
       // Check if already has the local pod reference

package/plugin/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/withiap.ts","./src/withlocalopeniap.ts"],"version":"5.9.2"}
+{"root":["./src/withIAP.ts","./src/withLocalOpenIAP.ts"],"version":"5.9.2"}

package/src/helpers/subscription.ts

@@ -1,9 +1,12 @@
-import { Platform } from 'react-native';
-import { getAvailablePurchases } from '../index';
+import {Platform} from 'react-native';
+import {getAvailablePurchases} from '../index';
 
 export interface ActiveSubscription {
   productId: string;
   isActive: boolean;
+  transactionId: string; // Transaction identifier for backend validation
+  purchaseToken?: string; // JWT token (iOS) or purchase token (Android) for backend validation
+  transactionDate: number; // Transaction timestamp
   expirationDateIOS?: Date;
   autoRenewingAndroid?: boolean;
   environmentIOS?: string;
@@ -17,13 +20,13 @@ export interface ActiveSubscription {
  * @returns Promise<ActiveSubscription[]> array of active subscriptions with details
  */
 export const getActiveSubscriptions = async (
-  subscriptionIds?: string[]
+  subscriptionIds?: string[],
 ): Promise<ActiveSubscription[]> => {
   try {
     const purchases = await getAvailablePurchases();
     const currentTime = Date.now();
     const activeSubscriptions: ActiveSubscription[] = [];
-    
+
     // Filter purchases to find active subscriptions
     const filteredPurchases = purchases.filter((purchase) => {
       // If specific IDs provided, filter by them
@@ -32,17 +35,16 @@ export const getActiveSubscriptions = async (
           return false;
         }
       }
-      
+
       // Check if this purchase has subscription-specific fields
-      const hasSubscriptionFields = 
-        ('expirationDateIOS' in purchase && purchase.expirationDateIOS) ||
-        ('autoRenewingAndroid' in purchase) ||
-        ('environmentIOS' in purchase && purchase.environmentIOS === 'Sandbox');
-      
+      const hasSubscriptionFields =
+        ('expirationDateIOS' in purchase && !!purchase.expirationDateIOS) ||
+        'autoRenewingAndroid' in purchase;
+
       if (!hasSubscriptionFields) {
         return false;
       }
-      
+
       // Check if it's actually active
       if (Platform.OS === 'ios') {
         if ('expirationDateIOS' in purchase && purchase.expirationDateIOS) {
@@ -53,8 +55,15 @@ export const getActiveSubscriptions = async (
         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 (!('expirationDateIOS' in purchase) || !purchase.expirationDateIOS) {
-            if (purchase.environmentIOS === 'Sandbox' && purchase.transactionDate && (currentTime - purchase.transactionDate) < dayInMs) {
+          if (
+            !('expirationDateIOS' in purchase) ||
+            !purchase.expirationDateIOS
+          ) {
+            if (
+              purchase.environmentIOS === 'Sandbox' &&
+              purchase.transactionDate &&
+              currentTime - purchase.transactionDate < dayInMs
+            ) {
               return true;
             }
           }
@@ -63,31 +72,34 @@ export const getActiveSubscriptions = async (
         // For Android, if it's in the purchases list, it's active
         return true;
       }
-      
+
       return false;
     });
-    
+
     // Convert to ActiveSubscription format
     for (const purchase of filteredPurchases) {
       const subscription: ActiveSubscription = {
         productId: purchase.productId,
         isActive: true,
+        transactionId: purchase.transactionId || purchase.id,
+        purchaseToken: purchase.purchaseToken,
+        transactionDate: purchase.transactionDate,
       };
-      
+
       // Add platform-specific details
       if (Platform.OS === 'ios') {
         if ('expirationDateIOS' in purchase && purchase.expirationDateIOS) {
           const expirationDate = new Date(purchase.expirationDateIOS);
           subscription.expirationDateIOS = expirationDate;
-          
+
           // Calculate days until expiration (round to nearest day)
           const daysUntilExpiration = Math.round(
-            (purchase.expirationDateIOS - currentTime) / (1000 * 60 * 60 * 24)
+            (purchase.expirationDateIOS - currentTime) / (1000 * 60 * 60 * 24),
           );
           subscription.daysUntilExpirationIOS = daysUntilExpiration;
           subscription.willExpireSoon = daysUntilExpiration <= 7;
         }
-        
+
         if ('environmentIOS' in purchase) {
           subscription.environmentIOS = purchase.environmentIOS;
         }
@@ -98,10 +110,10 @@ export const getActiveSubscriptions = async (
           subscription.willExpireSoon = !purchase.autoRenewingAndroid;
         }
       }
-      
+
       activeSubscriptions.push(subscription);
     }
-    
+
     return activeSubscriptions;
   } catch (error) {
     console.error('Error getting active subscriptions:', error);
@@ -115,8 +127,8 @@ export const getActiveSubscriptions = async (
  * @returns Promise<boolean> true if user has at least one active subscription
  */
 export const hasActiveSubscriptions = async (
-  subscriptionIds?: string[]
+  subscriptionIds?: string[],
 ): Promise<boolean> => {
   const subscriptions = await getActiveSubscriptions(subscriptionIds);
   return subscriptions.length > 0;
-};
+};

package/src/index.ts

@@ -72,17 +72,33 @@ export const emitter = (ExpoIapModule || NativeModulesProxy.ExpoIap) as {
 export const purchaseUpdatedListener = (
   listener: (event: Purchase) => void,
 ) => {
+  console.log('[JS] Registering purchaseUpdatedListener');
+  const wrappedListener = (event: Purchase) => {
+    console.log('[JS] purchaseUpdatedListener fired:', event);
+    listener(event);
+  };
   const emitterSubscription = emitter.addListener(
     OpenIapEvent.PurchaseUpdated,
-    listener,
+    wrappedListener,
   );
+  console.log('[JS] purchaseUpdatedListener registered successfully');
   return emitterSubscription;
 };
 
 export const purchaseErrorListener = (
   listener: (error: PurchaseError) => void,
 ) => {
-  return emitter.addListener(OpenIapEvent.PurchaseError, listener);
+  console.log('[JS] Registering purchaseErrorListener');
+  const wrappedListener = (error: PurchaseError) => {
+    console.log('[JS] purchaseErrorListener fired:', error);
+    listener(error);
+  };
+  const emitterSubscription = emitter.addListener(
+    OpenIapEvent.PurchaseError,
+    wrappedListener,
+  );
+  console.log('[JS] purchaseErrorListener registered successfully');
+  return emitterSubscription;
 };
 
 /**
@@ -233,16 +249,19 @@ export const fetchProducts = async ({
   }
 
   if (Platform.OS === 'ios') {
-    const rawItems = await ExpoIapModule.fetchProducts(skus);
+    const rawItems = await ExpoIapModule.fetchProducts({skus, type});
+
     const filteredItems = rawItems.filter((item: unknown) => {
-      if (!isProductIOS(item)) return false;
-      return (
+      if (!isProductIOS(item)) {
+        return false;
+      }
+      const isValid =
         typeof item === 'object' &&
         item !== null &&
         'id' in item &&
         typeof item.id === 'string' &&
-        skus.includes(item.id)
-      );
+        skus.includes(item.id);
+      return isValid;
     });
 
     return type === 'inapp'
@@ -273,11 +292,11 @@ export const fetchProducts = async ({
 
 /**
  * @deprecated Use `fetchProducts` instead. This method will be removed in version 3.0.0.
- * 
+ *
  * The 'request' prefix should only be used for event-based operations that trigger
  * purchase flows. Since this function simply fetches product information, it has been
  * renamed to `fetchProducts` to follow OpenIAP terminology guidelines.
- * 
+ *
  * @example
  * ```typescript
  * // Old way (deprecated)
@@ -285,7 +304,7 @@ export const fetchProducts = async ({
  *   skus: ['com.example.product1'],
  *   type: 'inapp'
  * });
- * 
+ *
  * // New way (recommended)
  * const products = await fetchProducts({
  *   skus: ['com.example.product1'],
@@ -301,9 +320,9 @@ export const requestProducts = async ({
   type?: 'inapp' | 'subs';
 }): Promise<Product[] | SubscriptionProduct[]> => {
   console.warn(
-    "`requestProducts` is deprecated. Use `fetchProducts` instead. The 'request' prefix should only be used for event-based operations. This method will be removed in version 3.0.0."
+    "`requestProducts` is deprecated. Use `fetchProducts` instead. The 'request' prefix should only be used for event-based operations. This method will be removed in version 3.0.0.",
   );
-  return fetchProducts({ skus, type });
+  return fetchProducts({skus, type});
 };
 
 /**
@@ -326,8 +345,10 @@ export const getPurchaseHistory = ({
     '`getPurchaseHistory` is deprecated. Use `getPurchaseHistories` instead. This function will be removed in version 3.0.0.',
   );
   return getPurchaseHistories({
-    alsoPublishToEventListenerIOS: alsoPublishToEventListenerIOS ?? alsoPublishToEventListener,
-    onlyIncludeActiveItemsIOS: onlyIncludeActiveItemsIOS ?? onlyIncludeActiveItems,
+    alsoPublishToEventListenerIOS:
+      alsoPublishToEventListenerIOS ?? alsoPublishToEventListener,
+    onlyIncludeActiveItemsIOS:
+      onlyIncludeActiveItemsIOS ?? onlyIncludeActiveItems,
   });
 };
 
@@ -390,8 +411,9 @@ export const getAvailablePurchases = ({
         ),
       android: async () => {
         const products = await ExpoIapModule.getAvailableItemsByType('inapp');
-        const subscriptions =
-          await ExpoIapModule.getAvailableItemsByType('subs');
+        const subscriptions = await ExpoIapModule.getAvailableItemsByType(
+          'subs',
+        );
         return products.concat(subscriptions);
       },
     }) || (() => Promise.resolve([]))
@@ -465,11 +487,7 @@ const normalizeRequestProps = (
  */
 export const requestPurchase = (
   requestObj: PurchaseRequest,
-): Promise<
-  | Purchase
-  | Purchase[]
-  | void
-> => {
+): Promise<Purchase | Purchase[] | void> => {
   const {request, type = 'inapp'} = requestObj;
 
   if (Platform.OS === 'ios') {
@@ -491,17 +509,15 @@ export const requestPurchase = (
 
     return (async () => {
       const offer = offerToRecordIOS(withOffer);
-      const purchase = await ExpoIapModule.requestPurchase(
+      const purchase = await ExpoIapModule.requestPurchase({
         sku,
         andDangerouslyFinishTransactionAutomatically,
         appAccountToken,
-        quantity ?? -1,
-        offer,
-      );
+        quantity,
+        withOffer: offer,
+      });
 
-      return type === 'inapp'
-        ? (purchase as Purchase)
-        : (purchase as Purchase);
+      return type === 'inapp' ? (purchase as Purchase) : (purchase as Purchase);
     })();
   }
 
@@ -629,10 +645,11 @@ export const finishTransaction = ({
       },
       android: async () => {
         const androidPurchase = purchase as PurchaseAndroid;
-        
+
         // Use purchaseToken if available, fallback to purchaseTokenAndroid for backward compatibility
-        const token = androidPurchase.purchaseToken || androidPurchase.purchaseTokenAndroid;
-        
+        const token =
+          androidPurchase.purchaseToken || androidPurchase.purchaseTokenAndroid;
+
         if (!token) {
           return Promise.reject(
             new PurchaseError(
@@ -642,8 +659,8 @@ export const finishTransaction = ({
               undefined,
               'E_DEVELOPER_ERROR' as ErrorCode,
               androidPurchase.productId,
-              'android'
-            )
+              'android',
+            ),
           );
         }