From eb3afb238f0edfb6a9ec50e11829f1dd0de25c1a Mon Sep 17 00:00:00 2001
From: Andres Aguilar <andres.aguilar@nfl.com>
Date: Mon, 29 Aug 2022 17:30:04 -0700
Subject: [PATCH 1/2] Reverted some files to maintain backwards compatibility

---
 IapExample/src/screens/ClassSetup.tsx    |  4 +-
 IapExample/src/screens/Products.tsx      | 10 ++---
 IapExample/src/screens/Subscriptions.tsx | 31 +++++++--------
 ios/RNIapIos.swift                       | 35 +++++++++++++----
 src/eventEmitter.ts                      | 33 +++++++++++++---
 src/hooks/useIAP.ts                      | 17 ++++----
 src/hooks/withIAPContext.tsx             | 33 +++++++++++++++-
 src/iap.ts                               | 47 ++++++++++++++++++----
 src/purchaseError.ts                     |  4 +-
 src/types/appleSK2.ts                    | 50 ++++++++++++++++++++++++
 src/types/index.ts                       |  4 +-
 11 files changed, 208 insertions(+), 60 deletions(-)
 create mode 100644 src/types/appleSK2.ts

diff --git a/IapExample/src/screens/ClassSetup.tsx b/IapExample/src/screens/ClassSetup.tsx
index e3b91e8ec..c917c3429 100644
--- a/IapExample/src/screens/ClassSetup.tsx
+++ b/IapExample/src/screens/ClassSetup.tsx
@@ -173,7 +173,7 @@ export class ClassSetup extends Component<{}, State> {
 
             {productList.map((product, index) => (
               <Row
-                key={product.id}
+                key={product.productId}
                 fields={[
                   {
                     label: 'Product JSON',
@@ -185,7 +185,7 @@ export class ClassSetup extends Component<{}, State> {
               >
                 <Button
                   title="Buy"
-                  onPress={() => this.requestSubscription(product.id)}
+                  onPress={() => this.requestSubscription(product.productId)}
                 />
               </Row>
             ))}
diff --git a/IapExample/src/screens/Products.tsx b/IapExample/src/screens/Products.tsx
index 4cf8e5e8c..6cdd81b05 100644
--- a/IapExample/src/screens/Products.tsx
+++ b/IapExample/src/screens/Products.tsx
@@ -21,7 +21,6 @@ export const Products = () => {
     initConnectionError,
     finishTransaction,
     getProducts,
-    setCurrentPurchase,
   } = useIAP();
 
   const handleGetProducts = async () => {
@@ -34,8 +33,7 @@ export const Products = () => {
 
   const handleBuyProduct = async (sku: Sku) => {
     try {
-      const transaction = await requestPurchase({sku});
-      setCurrentPurchase(transaction);
+      await requestPurchase({sku});
     } catch (error) {
       if (error instanceof PurchaseError) {
         errorLog({message: `[${error.code}]: ${error.message}`, error});
@@ -103,11 +101,11 @@ export const Products = () => {
 
           {products.map((product, index) => (
             <Row
-              key={product.id}
+              key={product.productId}
               fields={[
                 {
                   label: 'Product Id',
-                  value: product.id,
+                  value: product.productId,
                 },
                 {
                   label: 'type',
@@ -118,7 +116,7 @@ export const Products = () => {
             >
               <Button
                 title="Buy"
-                onPress={() => handleBuyProduct(product.id)}
+                onPress={() => handleBuyProduct(product.productId)}
               />
             </Row>
           ))}
diff --git a/IapExample/src/screens/Subscriptions.tsx b/IapExample/src/screens/Subscriptions.tsx
index e8d53f8b6..c143a4916 100644
--- a/IapExample/src/screens/Subscriptions.tsx
+++ b/IapExample/src/screens/Subscriptions.tsx
@@ -6,9 +6,10 @@ import {Box, Button, Heading, Row, State} from '../components';
 import {constants, contentContainerStyle, errorLog} from '../utils';
 
 export const Subscriptions = () => {
-  const {connected, subscriptions, getSubscriptions, setCurrentPurchase} =
-    useIAP();
-  const [ownedSubscriptions, setOwnedSubscriptions] = useState(new Set());
+  const {connected, subscriptions, getSubscriptions} = useIAP();
+  const [ownedSubscriptions /* TODO: setOwnedSubscriptions*/] = useState(
+    new Set(),
+  );
   const handleGetSubscriptions = async () => {
     try {
       await getSubscriptions({skus: constants.subscriptionSkus});
@@ -27,17 +28,12 @@ export const Subscriptions = () => {
       );
     }
     try {
-      const transaction = await requestSubscription({
+      await requestSubscription({
         sku: productId,
         ...(offerToken && {
           subscriptionOffers: [{sku: productId, offerToken}],
         }),
       });
-      console.warn('transaction', transaction);
-      setOwnedSubscriptions((prev) => {
-        return new Set([...prev, transaction?.productID]);
-      });
-      transaction && setCurrentPurchase(transaction);
     } catch (error) {
       if (error instanceof PurchaseError) {
         errorLog({message: `[${error.code}]: ${error.message}`, error});
@@ -57,11 +53,11 @@ export const Subscriptions = () => {
 
           {subscriptions.map((subscription, index) => (
             <Row
-              key={subscription.id}
+              key={subscription.productId}
               fields={[
                 {
                   label: 'Subscription Id',
-                  value: subscription.id,
+                  value: subscription.productId,
                 },
                 {
                   label: 'type',
@@ -70,10 +66,10 @@ export const Subscriptions = () => {
               ]}
               isLast={subscriptions.length - 1 === index}
             >
-              {ownedSubscriptions.has(subscription.id) && (
+              {ownedSubscriptions.has(subscription.productId) && (
                 <Text>Subscribed</Text>
               )}
-              {!ownedSubscriptions.has(subscription.id) &&
+              {!ownedSubscriptions.has(subscription.productId) &&
                 Platform.OS === 'android' &&
                 // On Google Play Billing V5 you might have  multiple offers for a single sku
                 subscription?.subscriptionOfferDetails?.map((offer) => (
@@ -82,16 +78,19 @@ export const Subscriptions = () => {
                       .map((ppl) => ppl.billingPeriod)
                       .join(',')}`}
                     onPress={() => {
-                      handleBuySubscription(subscription.id, offer.offerToken);
+                      handleBuySubscription(
+                        subscription.productId,
+                        offer.offerToken,
+                      );
                     }}
                   />
                 ))}
-              {!ownedSubscriptions.has(subscription.id) &&
+              {!ownedSubscriptions.has(subscription.productId) &&
                 Platform.OS === 'ios' && (
                   <Button
                     title="Subscribe"
                     onPress={() => {
-                      handleBuySubscription(subscription.id);
+                      handleBuySubscription(subscription.productId);
                     }}
                   />
                 )}
diff --git a/ios/RNIapIos.swift b/ios/RNIapIos.swift
index f04ea9af8..3246f6991 100644
--- a/ios/RNIapIos.swift
+++ b/ios/RNIapIos.swift
@@ -90,7 +90,7 @@ class RNIapIos: RCTEventEmitter {
     }
 
     override func supportedEvents() -> [String]? {
-        return [ "transaction-updated"]
+        return [ "iap-promoted-product", "purchase-updated", "purchase-error"]
     }
 
     @objc public func initConnection(
@@ -135,6 +135,15 @@ class RNIapIos: RCTEventEmitter {
     ) {
         Task {
             var purchasedItems: [ProductOrError] = []
+
+            func addPurchase(transaction: Transaction, product: Product) {
+                purchasedItems.append(ProductOrError(product: product, error: nil))
+                sendEvent(withName: "purchase-update", body: serialize(transaction))
+            }
+            func addError( error: Error, errorDict: [String: String]) {
+                purchasedItems.append(ProductOrError(product: nil, error: error))
+                sendEvent(withName: "purchase-error", body: errorDict)
+            }
             // Iterate through all of the user's purchased products.
             for await result in Transaction.currentEntitlements {
                 do {
@@ -144,7 +153,7 @@ class RNIapIos: RCTEventEmitter {
                     switch transaction.productType {
                     case .nonConsumable:
                         if let product = products[transaction.productID] {
-                            purchasedItems.append(ProductOrError(product: product, error: nil))
+                            addPurchase(transaction: transaction, product: product)
                         }
 
                     case .nonRenewable:
@@ -159,23 +168,35 @@ class RNIapIos: RCTEventEmitter {
                                                                                        to: transaction.purchaseDate)!
 
                             if currentDate < expirationDate {
-                                purchasedItems.append(ProductOrError(product: nonRenewable, error: nil))
+                                addPurchase(transaction: transaction, product: nonRenewable)
                             }
                         }
 
                     case .autoRenewable:
                         if let subscription = products[transaction.productID] {
-                            purchasedItems.append(ProductOrError(product: subscription, error: nil))
+                            addPurchase(transaction: transaction, product: subscription)
                         }
 
                     default:
                         break
                     }
                 } catch StoreError.failedVerification {
-                    purchasedItems.append(ProductOrError(product: nil, error: StoreError.failedVerification))
+                    let err = [ "responseCode": "1", // TODO
+                                "debugMessage": StoreError.failedVerification.localizedDescription,
+                                "code": "1", // TODO
+                                "message": StoreError.failedVerification.localizedDescription,
+                                "productId": "unknown"// TODO
+                    ]
+                    addError(error: StoreError.failedVerification, errorDict: err)
                 } catch {
                     debugMessage(error)
-                    purchasedItems.append(ProductOrError(product: nil, error: error))
+                    let err = [ "responseCode": "1", // TODO
+                                "debugMessage": error.localizedDescription,
+                                "code": "1", // TODO
+                                "message": error.localizedDescription,
+                                "productId": "unknown"// TODO
+                    ]
+                    addError(error: StoreError.failedVerification, errorDict: err)
                 }
             }
             // Check the `subscriptionGroupStatus` to learn the auto-renewable subscription state to determine whether the customer
@@ -282,7 +303,7 @@ class RNIapIos: RCTEventEmitter {
                         error)
                 }
             } else {
-                reject("E_DEVELOPER_ERROR", "Invalid product ID.", nil)
+                reject("E_DEVELOPER_ERROR", "Invalid product ID. Did you call getProducts/Subscriptions", nil)
             }
         }
     }
diff --git a/src/eventEmitter.ts b/src/eventEmitter.ts
index ee2001b00..71e1d2430 100644
--- a/src/eventEmitter.ts
+++ b/src/eventEmitter.ts
@@ -1,20 +1,20 @@
-import {NativeEventEmitter} from 'react-native';
+import {EmitterSubscription, NativeEventEmitter} from 'react-native';
 
-import {getAndroidModule, getNativeModule} from './iap';
-import {isAndroid} from './internal';
+import {getAndroidModule, getIosModule, getNativeModule} from './iap';
+import {isAndroid, isIos} from './internal';
+import type {PurchaseError} from './purchaseError';
 import type {Purchase} from './types';
 
 const eventEmitter = new NativeEventEmitter(getNativeModule());
 
 /**
  * Add IAP purchase event
- * TODO: Rename to transactionUpdatedListener
  */
 export const purchaseUpdatedListener = (
   listener: (event: Purchase) => void,
 ) => {
   const emitterSubscription = eventEmitter.addListener(
-    'transaction-updated',
+    'purchase-updated',
     listener,
   );
 
@@ -24,3 +24,26 @@ export const purchaseUpdatedListener = (
 
   return emitterSubscription;
 };
+
+/**
+ * Add IAP purchase error event
+ */
+export const purchaseErrorListener = (
+  listener: (error: PurchaseError) => void,
+): EmitterSubscription => eventEmitter.addListener('purchase-error', listener);
+
+/**
+ * Add IAP promoted subscription event
+ *
+ * @platform iOS
+ */
+export const promotedProductListener = (listener: () => void) => {
+  if (isIos) {
+    return new NativeEventEmitter(getIosModule()).addListener(
+      'iap-promoted-product',
+      listener,
+    );
+  }
+
+  return null;
+};
diff --git a/src/hooks/useIAP.ts b/src/hooks/useIAP.ts
index 22e7f0610..9bf8df27a 100644
--- a/src/hooks/useIAP.ts
+++ b/src/hooks/useIAP.ts
@@ -15,6 +15,7 @@ import {useIAPContext} from './withIAPContext';
 type IAP_STATUS = {
   connected: boolean;
   products: Product[];
+  promotedProductsIOS: Product[];
   subscriptions: Subscription[];
   purchaseHistory: Purchase[];
   availablePurchases: Purchase[];
@@ -34,13 +35,13 @@ type IAP_STATUS = {
   getPurchaseHistory: () => Promise<void>;
   getProducts: ({skus}: {skus: string[]}) => Promise<void>;
   getSubscriptions: ({skus}: {skus: string[]}) => Promise<void>;
-  setCurrentPurchase: (currentPurchase: Purchase | undefined) => void;
 };
 
 export function useIAP(): IAP_STATUS {
   const {
     connected,
     products,
+    promotedProductsIOS,
     subscriptions,
     purchaseHistory,
     availablePurchases,
@@ -57,9 +58,7 @@ export function useIAP(): IAP_STATUS {
 
   const getProducts = useCallback(
     async ({skus}: {skus: string[]}): Promise<void> => {
-      const prods = await iapGetProducts({skus});
-      console.log(prods);
-      setProducts(prods);
+      setProducts(await iapGetProducts({skus}));
     },
     [setProducts],
   );
@@ -98,18 +97,18 @@ export function useIAP(): IAP_STATUS {
       } catch (err) {
         throw err;
       } finally {
-        if (purchase.id === currentPurchase?.id) {
+        if (purchase.productId === currentPurchase?.productId) {
           setCurrentPurchase(undefined);
         }
 
-        if (purchase.id === currentPurchaseError?.id) {
+        if (purchase.productId === currentPurchaseError?.productId) {
           setCurrentPurchaseError(undefined);
         }
       }
     },
     [
-      currentPurchase?.id,
-      currentPurchaseError?.id,
+      currentPurchase?.productId,
+      currentPurchaseError?.productId,
       setCurrentPurchase,
       setCurrentPurchaseError,
     ],
@@ -118,6 +117,7 @@ export function useIAP(): IAP_STATUS {
   return {
     connected,
     products,
+    promotedProductsIOS,
     subscriptions,
     purchaseHistory,
     availablePurchases,
@@ -129,6 +129,5 @@ export function useIAP(): IAP_STATUS {
     getSubscriptions,
     getAvailablePurchases,
     getPurchaseHistory,
-    setCurrentPurchase,
   };
 }
diff --git a/src/hooks/withIAPContext.tsx b/src/hooks/withIAPContext.tsx
index ff64d7f30..a07d0783a 100644
--- a/src/hooks/withIAPContext.tsx
+++ b/src/hooks/withIAPContext.tsx
@@ -1,7 +1,11 @@
 import React, {useContext, useEffect, useMemo, useState} from 'react';
 
-import {purchaseUpdatedListener} from '../eventEmitter';
-import {initConnection} from '../iap';
+import {
+  promotedProductListener,
+  purchaseErrorListener,
+  purchaseUpdatedListener,
+} from '../eventEmitter';
+import {getPromotedProductIOS, initConnection} from '../iap';
 import type {PurchaseError} from '../purchaseError';
 import type {
   Product,
@@ -14,6 +18,7 @@ import type {
 type IAPContextType = {
   connected: boolean;
   products: Product[];
+  promotedProductsIOS: Product[];
   subscriptions: Subscription[];
   purchaseHistory: Purchase[];
   availablePurchases: Purchase[];
@@ -47,6 +52,10 @@ export function withIAPContext<T>(Component: React.ComponentType<T>) {
   return function WrapperComponent(props: T) {
     const [connected, setConnected] = useState(false);
     const [products, setProducts] = useState<Product[]>([]);
+
+    const [promotedProductsIOS, setPromotedProductsIOS] = useState<Product[]>(
+      [],
+    );
     const [subscriptions, setSubscriptions] = useState<Subscription[]>([]);
     const [purchaseHistory, setPurchaseHistory] = useState<Purchase[]>([]);
 
@@ -65,6 +74,7 @@ export function withIAPContext<T>(Component: React.ComponentType<T>) {
         connected,
         products,
         subscriptions,
+        promotedProductsIOS,
         purchaseHistory,
         availablePurchases,
         currentPurchase,
@@ -81,6 +91,7 @@ export function withIAPContext<T>(Component: React.ComponentType<T>) {
         connected,
         products,
         subscriptions,
+        promotedProductsIOS,
         purchaseHistory,
         availablePurchases,
         currentPurchase,
@@ -116,8 +127,26 @@ export function withIAPContext<T>(Component: React.ComponentType<T>) {
         },
       );
 
+      const purchaseErrorSubscription = purchaseErrorListener(
+        (error: PurchaseError) => {
+          setCurrentPurchase(undefined);
+          setCurrentPurchaseError(error);
+        },
+      );
+
+      const promotedProductSubscription = promotedProductListener(async () => {
+        const product = await getPromotedProductIOS();
+
+        setPromotedProductsIOS((prevProducts) => [
+          ...prevProducts,
+          ...(product ? [product] : []),
+        ]);
+      });
+
       return () => {
         purchaseUpdateSubscription.remove();
+        purchaseErrorSubscription.remove();
+        promotedProductSubscription?.remove();
       };
     }, [connected]);
 
diff --git a/src/iap.ts b/src/iap.ts
index d6045fa6c..1ea4ac898 100644
--- a/src/iap.ts
+++ b/src/iap.ts
@@ -2,6 +2,7 @@ import {Linking, NativeModules, Platform} from 'react-native';
 
 import type * as Amazon from './types/amazon';
 import type * as Android from './types/android';
+import {productSk2Map, subscriptionSk2Map} from './types/appleSK2';
 import {
   enhancedFetch,
   fillProductsWithAdditionalData,
@@ -32,6 +33,10 @@ export const getInstallSourceAndroid = (): InstallSourceAndroid => {
 
 let androidNativeModule = RNIapModule;
 
+let iosNativeModule = RNIapIos;
+
+let isIosStorekit2 = RNIapIos && RNIapIos === iosNativeModule;
+
 export const setAndroidNativeModule = (
   nativeModule: typeof RNIapModule,
 ): void => {
@@ -110,9 +115,14 @@ export const getProducts = ({
   (
     Platform.select({
       ios: async () => {
-        const items = await getIosModule().getItems(skus);
-
-        return items.filter((item: Product) => item.subscription === null);
+        let items = await getIosModule().getItems(skus);
+        if (isIosStorekit2) {
+          items = items.map(productSk2Map);
+        }
+        return items.filter(
+          (item: Product) =>
+            skus.includes(item.productId) && item.type === 'iap',
+        );
       },
       android: async () => {
         const products = await getAndroidModule().getItemsByType(
@@ -138,13 +148,13 @@ export const getSubscriptions = ({
   (
     Platform.select({
       ios: async () => {
-        const items = await getIosModule().getItems(skus);
-
+        let items = await getIosModule().getItems(skus);
+        if (isIosStorekit2) {
+          items = items.map(subscriptionSk2Map);
+        }
         return items.filter(
           (item: Subscription) =>
-            skus.includes(
-              item.id,
-            ) /* TODO: only works for nonrenewable subs && !!item.subscription*/,
+            skus.includes(item.productId) && item.type === 'subs',
         );
       },
       android: async () => {
@@ -412,6 +422,27 @@ export const acknowledgePurchaseAndroid = ({
   return getAndroidModule().acknowledgePurchase(token, developerPayload);
 };
 
+/**
+ * Should Add Store Payment (iOS only)
+ *   Indicates the the App Store purchase should continue from the app instead of the App Store.
+ * @returns {Promise<Product | null>} promoted product
+ */
+export const getPromotedProductIOS = (): Promise<Product | null> => {
+  if (!isIosStorekit2) {
+    return getIosModule().promotedProduct();
+  } else {
+    return Promise.reject('Only available on SK1');
+  }
+};
+
+/**
+ * Buy the currently selected promoted product (iOS only)
+ *   Initiates the payment process for a promoted product. Should only be called in response to the `iap-promoted-product` event.
+ * @returns {Promise<void>}
+ */
+export const buyPromotedProductIOS = (): Promise<void> =>
+  getIosModule().buyPromotedProduct();
+
 /**
  * Deep link to subscriptions screen on Android. No-op on iOS.
  * @param {string} sku The product's SKU (on Android)
diff --git a/src/purchaseError.ts b/src/purchaseError.ts
index 2c3f1aa45..6b68ca86b 100644
--- a/src/purchaseError.ts
+++ b/src/purchaseError.ts
@@ -23,13 +23,13 @@ export class PurchaseError implements Error {
     public responseCode?: number,
     public debugMessage?: string,
     public code?: ErrorCode,
-    public id?: string,
+    public productId?: string,
   ) {
     this.name = '[react-native-iap]: PurchaseError';
     this.message = message;
     this.responseCode = responseCode;
     this.debugMessage = debugMessage;
     this.code = code;
-    this.id = id;
+    this.productId = productId;
   }
 }
diff --git a/src/types/appleSK2.ts b/src/types/appleSK2.ts
new file mode 100644
index 000000000..ac4eaf9cd
--- /dev/null
+++ b/src/types/appleSK2.ts
@@ -0,0 +1,50 @@
+import type {ProductIOS, SubscriptionIOS} from '.';
+
+export type ProductSK2 = {
+  description: string;
+  displayName: string;
+  displayPrice: string;
+  id: number;
+  isFamilyShareable: boolean;
+  jsonRepresentation: string;
+  price: number;
+  subscription: any; //TODO
+  type: 'autoRenewable' | 'consumable' | 'nonConsumable' | 'nonRenewable';
+};
+export const productSk2Map = ({
+  id,
+  description,
+  displayName,
+  price,
+  displayPrice,
+}: ProductSK2): ProductIOS => {
+  const prod: ProductIOS = {
+    title: displayName,
+    productId: String(id),
+    description,
+    type: 'iap',
+    price: String(price),
+    localizedPrice: displayPrice,
+    currency: '', //TODO: Not avaiable on new API, use localizedPrice instead?
+  };
+  return prod;
+};
+
+export const subscriptionSk2Map = ({
+  id,
+  description,
+  displayName,
+  price,
+  displayPrice,
+}: ProductSK2): SubscriptionIOS => {
+  const prod: SubscriptionIOS = {
+    title: displayName,
+    productId: String(id),
+    description,
+    type: 'subs',
+    price: String(price),
+    localizedPrice: displayPrice,
+    currency: '', //TODO: Not avaiable on new API, use localizedPrice instead?
+  };
+  return prod;
+};
diff --git a/src/types/index.ts b/src/types/index.ts
index 02907d940..4fa40cc9f 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -26,6 +26,7 @@ export enum InstallSourceAndroid {
 
 export interface ProductCommon {
   type: 'subs' | 'sub' | 'inapp' | 'iap';
+  productId: string; //iOS
   productIds?: string[];
   title: string;
   description: string;
@@ -99,8 +100,6 @@ export interface ProductAndroid extends ProductCommon {
   };
 }
 export interface ProductIOS extends ProductCommon {
-  subscription: null;
-  id: string;
   type: 'inapp' | 'iap';
 }
 
@@ -132,7 +131,6 @@ export interface SubscriptionAndroid extends ProductCommon {
 
 export interface SubscriptionIOS extends ProductCommon {
   type: 'subs';
-  id: string;
   discounts?: Discount[];
   introductoryPrice?: string;
   introductoryPriceAsAmountIOS?: string;

From 2a44c84af04cb7c916db7b6cc16ec88fccc99c08 Mon Sep 17 00:00:00 2001
From: Andres Aguilar <andres.aguilar@nfl.com>
Date: Tue, 30 Aug 2022 09:18:35 -0700
Subject: [PATCH 2/2] use productId

---
 IapExample/src/screens/Products.tsx      |  2 +-
 IapExample/src/screens/Subscriptions.tsx | 39 +++++++++++++++++++++---
 src/iap.ts                               |  2 +-
 src/types/index.ts                       |  2 --
 4 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/IapExample/src/screens/Products.tsx b/IapExample/src/screens/Products.tsx
index 6cdd81b05..c59927e41 100644
--- a/IapExample/src/screens/Products.tsx
+++ b/IapExample/src/screens/Products.tsx
@@ -46,7 +46,7 @@ export const Products = () => {
   useEffect(() => {
     const checkCurrentPurchase = async () => {
       try {
-        if (currentPurchase?.id) {
+        if (currentPurchase?.productId) {
           await finishTransaction({
             purchase: currentPurchase,
             isConsumable: true,
diff --git a/IapExample/src/screens/Subscriptions.tsx b/IapExample/src/screens/Subscriptions.tsx
index c143a4916..dcb117196 100644
--- a/IapExample/src/screens/Subscriptions.tsx
+++ b/IapExample/src/screens/Subscriptions.tsx
@@ -1,4 +1,4 @@
-import React, {useState} from 'react';
+import React, {useEffect, useState} from 'react';
 import {Platform, ScrollView, StyleSheet, Text, View} from 'react-native';
 import {PurchaseError, requestSubscription, useIAP} from 'react-native-iap';
 
@@ -6,10 +6,14 @@ import {Box, Button, Heading, Row, State} from '../components';
 import {constants, contentContainerStyle, errorLog} from '../utils';
 
 export const Subscriptions = () => {
-  const {connected, subscriptions, getSubscriptions} = useIAP();
-  const [ownedSubscriptions /* TODO: setOwnedSubscriptions*/] = useState(
-    new Set(),
-  );
+  const {
+    connected,
+    subscriptions,
+    getSubscriptions,
+    currentPurchase,
+    finishTransaction,
+  } = useIAP();
+  const [ownedSubscriptions, setOwnedSubscriptions] = useState(new Set());
   const handleGetSubscriptions = async () => {
     try {
       await getSubscriptions({skus: constants.subscriptionSkus});
@@ -43,6 +47,31 @@ export const Subscriptions = () => {
     }
   };
 
+  useEffect(() => {
+    const checkCurrentPurchase = async () => {
+      try {
+        if (currentPurchase?.productId) {
+          await finishTransaction({
+            purchase: currentPurchase,
+            isConsumable: true,
+          });
+
+          setOwnedSubscriptions(
+            (prev) => new Set([...prev, currentPurchase?.productId]),
+          );
+        }
+      } catch (error) {
+        if (error instanceof PurchaseError) {
+          errorLog({message: `[${error.code}]: ${error.message}`, error});
+        } else {
+          errorLog({message: 'handleBuyProduct', error});
+        }
+      }
+    };
+
+    checkCurrentPurchase();
+  }, [currentPurchase, finishTransaction]);
+
   return (
     <ScrollView contentContainerStyle={contentContainerStyle}>
       <State connected={connected} />
diff --git a/src/iap.ts b/src/iap.ts
index 1ea4ac898..cee1c84af 100644
--- a/src/iap.ts
+++ b/src/iap.ts
@@ -378,7 +378,7 @@ export const finishTransaction = ({
   return (
     Platform.select({
       ios: async () => {
-        return getIosModule().finishTransaction(purchase.id + '');
+        return getIosModule().finishTransaction(purchase.productId);
       },
       android: async () => {
         if (purchase) {
diff --git a/src/types/index.ts b/src/types/index.ts
index 4fa40cc9f..d1401e89f 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -38,13 +38,11 @@ export interface ProductCommon {
 
 export interface ProductPurchase {
   productId: string;
-  productID: string; //iOS naming
   transactionId?: string;
   transactionDate: number;
   transactionReceipt: string;
   purchaseToken?: string;
   //iOS
-  id: String;
   quantityIOS?: number;
   originalTransactionDateIOS?: string;
   originalTransactionIdentifierIOS?: string;