From 06b2675dd8e998e9b6a0c40a147eaf5e5b8f6b7b Mon Sep 17 00:00:00 2001
From: Andres Aguilar <andresesfm@gmail.com>
Date: Thu, 25 Aug 2022 09:53:24 -0700
Subject: [PATCH] product purchase lifecycle (#1888)

* Able to purchase products

* swift lint

* fixed lint issues, removed methods

Co-authored-by: Andres Aguilar <andres.aguilar@nfl.com>
---
 IapExample/ios/Configuration.storekit         |  48 +++++
 .../ios/IapExample.xcodeproj/project.pbxproj  |   4 +
 .../xcschemes/IapExample.xcscheme             |   3 +
 IapExample/ios/Podfile.lock                   |   4 +-
 IapExample/src/screens/ClassSetup.tsx         |  16 +-
 IapExample/src/screens/Products.tsx           |  33 +---
 IapExample/src/screens/Subscriptions.tsx      |  11 +-
 ios/IapSerializationUtils.swift               |   7 +-
 ios/RNIapIos.m                                |   6 +-
 ios/RNIapIos.swift                            | 175 +++++++++---------
 src/eventEmitter.ts                           |   3 +-
 src/hooks/useIAP.ts                           |   7 +-
 src/hooks/withIAPContext.tsx                  |  25 +--
 src/iap.ts                                    | 129 +------------
 src/types/index.ts                            |  13 +-
 15 files changed, 187 insertions(+), 297 deletions(-)
 create mode 100644 IapExample/ios/Configuration.storekit

diff --git a/IapExample/ios/Configuration.storekit b/IapExample/ios/Configuration.storekit
new file mode 100644
index 000000000..e57a4bbcb
--- /dev/null
+++ b/IapExample/ios/Configuration.storekit
@@ -0,0 +1,48 @@
+{
+  "identifier" : "5BB04EE6",
+  "nonRenewingSubscriptions" : [
+
+  ],
+  "products" : [
+    {
+      "displayPrice" : "0.99",
+      "familyShareable" : false,
+      "internalID" : "FF5725DC",
+      "localizations" : [
+        {
+          "description" : "",
+          "displayName" : "",
+          "locale" : "en_US"
+        }
+      ],
+      "productID" : "com.cooni.point1000",
+      "referenceName" : "1000 points",
+      "type" : "Consumable"
+    },
+    {
+      "displayPrice" : "2.99",
+      "familyShareable" : false,
+      "internalID" : "47DD16EA",
+      "localizations" : [
+        {
+          "description" : "",
+          "displayName" : "",
+          "locale" : "en_US"
+        }
+      ],
+      "productID" : "com.cooni.point5000",
+      "referenceName" : "5000 points",
+      "type" : "NonConsumable"
+    }
+  ],
+  "settings" : {
+
+  },
+  "subscriptionGroups" : [
+
+  ],
+  "version" : {
+    "major" : 1,
+    "minor" : 2
+  }
+}
diff --git a/IapExample/ios/IapExample.xcodeproj/project.pbxproj b/IapExample/ios/IapExample.xcodeproj/project.pbxproj
index 86fd3f4fc..4bbae8907 100644
--- a/IapExample/ios/IapExample.xcodeproj/project.pbxproj
+++ b/IapExample/ios/IapExample.xcodeproj/project.pbxproj
@@ -14,6 +14,7 @@
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		7699B88040F8A987B510C191 /* libPods-IapExample-IapExampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-IapExample-IapExampleTests.a */; };
 		81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
+		8553967928B5A2D700E7E3CE /* Configuration.storekit in Resources */ = {isa = PBXBuildFile; fileRef = 8553967828B5A2D700E7E3CE /* Configuration.storekit */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -42,6 +43,7 @@
 		5B7EB9410499542E8C5724F5 /* Pods-IapExample-IapExampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IapExample-IapExampleTests.debug.xcconfig"; path = "Target Support Files/Pods-IapExample-IapExampleTests/Pods-IapExample-IapExampleTests.debug.xcconfig"; sourceTree = "<group>"; };
 		5DCACB8F33CDC322A6C60F78 /* libPods-IapExample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-IapExample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = IapExample/LaunchScreen.storyboard; sourceTree = "<group>"; };
+		8553967828B5A2D700E7E3CE /* Configuration.storekit */ = {isa = PBXFileReference; lastKnownFileType = text; path = Configuration.storekit; sourceTree = "<group>"; };
 		89C6BE57DB24E9ADA2F236DE /* Pods-IapExample-IapExampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IapExample-IapExampleTests.release.xcconfig"; path = "Target Support Files/Pods-IapExample-IapExampleTests/Pods-IapExample-IapExampleTests.release.xcconfig"; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
@@ -92,6 +94,7 @@
 				13B07FB61A68108700A75B9A /* Info.plist */,
 				81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */,
 				13B07FB71A68108700A75B9A /* main.m */,
+				8553967828B5A2D700E7E3CE /* Configuration.storekit */,
 			);
 			name = IapExample;
 			sourceTree = "<group>";
@@ -243,6 +246,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
+				8553967928B5A2D700E7E3CE /* Configuration.storekit in Resources */,
 				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/IapExample/ios/IapExample.xcodeproj/xcshareddata/xcschemes/IapExample.xcscheme b/IapExample/ios/IapExample.xcodeproj/xcshareddata/xcschemes/IapExample.xcscheme
index 84938ba74..c7beab13b 100644
--- a/IapExample/ios/IapExample.xcodeproj/xcshareddata/xcschemes/IapExample.xcscheme
+++ b/IapExample/ios/IapExample.xcodeproj/xcshareddata/xcschemes/IapExample.xcscheme
@@ -60,6 +60,9 @@
             ReferencedContainer = "container:IapExample.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <StoreKitConfigurationFileReference
+         identifier = "../Configuration.storekit">
+      </StoreKitConfigurationFileReference>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/IapExample/ios/Podfile.lock b/IapExample/ios/Podfile.lock
index f4f43016b..6b83d36bd 100644
--- a/IapExample/ios/Podfile.lock
+++ b/IapExample/ios/Podfile.lock
@@ -360,7 +360,7 @@ PODS:
     - React-Core
   - RNGestureHandler (2.5.0):
     - React-Core
-  - RNIap (9.0.0):
+  - RNIap (10.0.0):
     - React-Core
   - RNScreens (3.15.0):
     - React-Core
@@ -575,7 +575,7 @@ SPEC CHECKSUMS:
   ReactCommon: e30ec17dfb1d4c4f3419eac254350d6abca6d5a2
   RNCMaskedView: cb9670ea9239998340eaab21df13fa12a1f9de15
   RNGestureHandler: bad495418bcbd3ab47017a38d93d290ebd406f50
-  RNIap: 95084640290f4d68559dc37f1c8424b3f7dbf5d8
+  RNIap: 6f4925d680b31ff5d252f982aad12c8b66200b31
   RNScreens: 4a1af06327774490d97342c00aee0c2bafb497b7
   SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
   Yoga: 7ab6e3ee4ce47d7b789d1cb520163833e515f452
diff --git a/IapExample/src/screens/ClassSetup.tsx b/IapExample/src/screens/ClassSetup.tsx
index 32ff51a4d..295a1e595 100644
--- a/IapExample/src/screens/ClassSetup.tsx
+++ b/IapExample/src/screens/ClassSetup.tsx
@@ -8,7 +8,6 @@ import {
   View,
 } from 'react-native';
 import {
-  clearTransactionIOS,
   endConnection,
   finishTransaction,
   flushFailedPurchasesCachedAsPendingAndroid,
@@ -65,17 +64,6 @@ export class ClassSetup extends Component<{}, State> {
 
       if (isAndroid) {
         await flushFailedPurchasesCachedAsPendingAndroid();
-      } else {
-        /**
-         * WARNING This line should not be included in production code
-         * This call will call finishTransaction in all pending purchases
-         * on every launch, effectively consuming purchases that you might
-         * not have verified the receipt or given the consumer their product
-         *
-         * TL;DR you will no longer receive any updates from Apple on
-         * every launch for pending purchases
-         */
-        await clearTransactionIOS();
       }
     } catch (error) {
       if (error instanceof PurchaseError) {
@@ -199,7 +187,7 @@ export class ClassSetup extends Component<{}, State> {
 
             {productList.map((product, index) => (
               <Row
-                key={product.productId}
+                key={product.id}
                 fields={[
                   {
                     label: 'Product JSON',
@@ -211,7 +199,7 @@ export class ClassSetup extends Component<{}, State> {
               >
                 <Button
                   title="Buy"
-                  onPress={() => this.requestSubscription(product.productId)}
+                  onPress={() => this.requestSubscription(product.id)}
                 />
               </Row>
             ))}
diff --git a/IapExample/src/screens/Products.tsx b/IapExample/src/screens/Products.tsx
index d1d4206dd..067537e54 100644
--- a/IapExample/src/screens/Products.tsx
+++ b/IapExample/src/screens/Products.tsx
@@ -16,7 +16,6 @@ export const Products = () => {
   const {
     connected,
     products,
-    promotedProductsIOS,
     currentPurchase,
     currentPurchaseError,
     initConnectionError,
@@ -102,18 +101,22 @@ export const Products = () => {
 
           {products.map((product, index) => (
             <Row
-              key={product.productId}
+              key={product.id}
               fields={[
                 {
                   label: 'Product Id',
-                  value: product.productId,
+                  value: product.id,
+                },
+                {
+                  label: 'type',
+                  value: product.type,
                 },
               ]}
               isLast={products.length - 1 === index}
             >
               <Button
                 title="Buy"
-                onPress={() => handleBuyProduct(product.productId)}
+                onPress={() => handleBuyProduct(product.id)}
               />
             </Row>
           ))}
@@ -121,28 +124,6 @@ export const Products = () => {
 
         <Button title="Get the products" onPress={handleGetProducts} />
       </Box>
-
-      <Box>
-        <Heading copy="Promoted products" label="iOS only" />
-
-        {promotedProductsIOS.map((product, index) => (
-          <Row
-            key={product.productId}
-            fields={[
-              {
-                label: 'Product Id',
-                value: product.productId,
-              },
-            ]}
-            isLast={promotedProductsIOS.length - 1 === index}
-          >
-            <Button
-              title="Buy a product"
-              onPress={() => handleBuyProduct(product.productId)}
-            />
-          </Row>
-        ))}
-      </Box>
     </ScrollView>
   );
 };
diff --git a/IapExample/src/screens/Subscriptions.tsx b/IapExample/src/screens/Subscriptions.tsx
index 23819eaaa..8dfefd6ea 100644
--- a/IapExample/src/screens/Subscriptions.tsx
+++ b/IapExample/src/screens/Subscriptions.tsx
@@ -51,11 +51,11 @@ export const Subscriptions = () => {
 
           {subscriptions.map((subscription, index) => (
             <Row
-              key={subscription.productId}
+              key={subscription.id}
               fields={[
                 {
                   label: 'Subscription Id',
-                  value: subscription.productId,
+                  value: subscription.id,
                 },
               ]}
               isLast={subscriptions.length - 1 === index}
@@ -68,10 +68,7 @@ export const Subscriptions = () => {
                       .map((ppl) => ppl.billingPeriod)
                       .join(',')}`}
                     onPress={() => {
-                      handleBuySubscription(
-                        subscription.productId,
-                        offer.offerToken,
-                      );
+                      handleBuySubscription(subscription.id, offer.offerToken);
                     }}
                   />
                 ))}
@@ -79,7 +76,7 @@ export const Subscriptions = () => {
                 <Button
                   title="Subscribe"
                   onPress={() => {
-                    handleBuySubscription(subscription.productId);
+                    handleBuySubscription(subscription.id);
                   }}
                 />
               )}
diff --git a/ios/IapSerializationUtils.swift b/ios/IapSerializationUtils.swift
index 170b31f10..c37886152 100644
--- a/ios/IapSerializationUtils.swift
+++ b/ios/IapSerializationUtils.swift
@@ -15,9 +15,8 @@ func serialize(_ p: Product) -> [String: Any?] {
             "displayPrice": p.displayPrice,
             "price": p.price,
             "isFamilyShareable": p.isFamilyShareable,
-            "subscription": p.subscription?.subscriptionGroupID,
-            "jsonRepresentation": p.jsonRepresentation,
-            "debugDescription": p.debugDescription,
+            "jsonRepresentation": String( decoding: p.jsonRepresentation, as: UTF8.self),
+            // "debugDescription": p.debugDescription,
             "subscription": serialize(p.subscription),
             "type": serialize(p.type)
     ]
@@ -58,7 +57,7 @@ func serialize(_ t: Transaction) -> [String: Any?] {
             "offerID": t.offerID,
             "subscriptionGroupID": t.subscriptionGroupID,
             "appAccountToken": t.appAccountToken,
-            "debugDescription": t.debugDescription,
+            // "debugDescription": t.debugDescription,
             "deviceVerification": t.deviceVerification,
             "deviceVerificationNonce": t.deviceVerificationNonce,
             "expirationDate": t.expirationDate,
diff --git a/ios/RNIapIos.m b/ios/RNIapIos.m
index f50038e32..bcbb3a177 100644
--- a/ios/RNIapIos.m
+++ b/ios/RNIapIos.m
@@ -12,7 +12,7 @@ @interface RCT_EXTERN_MODULE (RNIapIos, NSObject)
                   (RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(products:
+RCT_EXTERN_METHOD(getItems:
                   (NSArray*)skus
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
@@ -21,12 +21,12 @@ @interface RCT_EXTERN_MODULE (RNIapIos, NSObject)
                   (RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(purchase:
+RCT_EXTERN_METHOD(buyProduct:
                   (NSString*)sku
                   andDangerouslyFinishTransactionAutomatically:(BOOL)andDangerouslyFinishTransactionAutomatically
                   appAccountToken:(NSString*)appAccountToken
                   quantity:(NSInteger)quantity
-                  withOffer:(NSDictionary*)discountOffer
+                  withOffer:(NSDictionary*)withOffer
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
diff --git a/ios/RNIapIos.swift b/ios/RNIapIos.swift
index 49461121a..37dbff4ca 100644
--- a/ios/RNIapIos.swift
+++ b/ios/RNIapIos.swift
@@ -109,22 +109,27 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate {
         resolve(nil)
     }
 
-    @objc public func products( // TODO: renamed from getItems
+    @objc public func getItems(
         _ skus: [String],
         resolve: @escaping RCTPromiseResolveBlock = { _ in },
         reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
-    ) async {
-        do {
-            let products: [[String: Any?]] = try await Product.products(for: skus).map({ (prod: Product) -> [String: Any?]? in
-                return serialize(prod)
-            }).compactMap({$0})
-            resolve(products)
-        } catch {
-            reject(IapErrors.E_UNKNOWN.rawValue, "Error fetching items", error)
+    ) {
+        Task {
+            do {
+                let products = try await Product.products(for: skus)
+                self.products = products.reduce(into: [String: Product]()) {(res, prod) in
+                    res[prod.id] = prod
+                }
+                resolve(products.map({ (prod: Product) -> [String: Any?]? in
+                    return serialize(prod)
+                }).compactMap({$0}))
+            } catch {
+                reject(IapErrors.E_UNKNOWN.rawValue, "Error fetching items", error)
+            }
         }
     }
 
-    @objc public func currentEntitlements( // TODO: renamed from getAvailableItems
+    @objc public func currentEntitlements(
         _ resolve: @escaping RCTPromiseResolveBlock = { _ in },
         reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
     ) async {
@@ -181,101 +186,103 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate {
         resolve(purchasedItems.map({(p: ProductOrError) in ["product": p.product.flatMap { serialize($0)}, "error": serialize(p.error)]}))
     }
 
-    @objc public func purchase( // TODO: renamed from buyProduct
+    @objc public func buyProduct(
         _ sku: String,
         andDangerouslyFinishTransactionAutomatically: Bool,
         appAccountToken: String?,
         quantity: Int,
-        withOffer discountOffer: [String: String],
+        withOffer: [String: String],
         resolve: @escaping RCTPromiseResolveBlock = { _ in },
         reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
-    ) async {
-        let product: Product? = products[sku]
+    ) {
+        Task {
+            let product: Product? = products[sku]
 
-        if let product = product {
-            do {
-                var options: Set<Product.PurchaseOption> = []
-                if quantity > -1 {
-                    options.insert(.quantity(quantity))
-                }
+            if let product = product {
+                do {
+                    var options: Set<Product.PurchaseOption> = []
+                    if quantity > -1 {
+                        options.insert(.quantity(quantity))
+                    }
 
-                let offerID = discountOffer["offerID"] // TODO: Adjust JS to match these new names
-                let keyID = discountOffer["keyID"]
-                let nonce = discountOffer["nonce"]
-                let signature = discountOffer["signature"]
-                let timestamp = discountOffer["timestamp"]
+                    let offerID = withOffer["offerID"] // TODO: Adjust JS to match these new names
+                    let keyID = withOffer["keyID"]
+                    let nonce = withOffer["nonce"]
+                    let signature = withOffer["signature"]
+                    let timestamp = withOffer["timestamp"]
 
-                if let offerID = offerID, let keyID = keyID, let nonce = nonce, let nonce = UUID(uuidString: nonce), let signature = signature, let signature = signature.data(using: .utf8), let timestamp = timestamp, let timestamp = Int(timestamp) {
-                    options.insert(.promotionalOffer(offerID: offerID, keyID: keyID, nonce: nonce, signature: signature, timestamp: timestamp ))
-                }
-                if let appAccountToken = appAccountToken, let appAccountToken = UUID(uuidString: appAccountToken) {
-                    options.insert(.appAccountToken(appAccountToken))
-                }
-                debugMessage("Purchase Started")
+                    if let offerID = offerID, let keyID = keyID, let nonce = nonce, let nonce = UUID(uuidString: nonce), let signature = signature, let signature = signature.data(using: .utf8), let timestamp = timestamp, let timestamp = Int(timestamp) {
+                        options.insert(.promotionalOffer(offerID: offerID, keyID: keyID, nonce: nonce, signature: signature, timestamp: timestamp ))
+                    }
+                    if let appAccountToken = appAccountToken, let appAccountToken = UUID(uuidString: appAccountToken) {
+                        options.insert(.appAccountToken(appAccountToken))
+                    }
+                    debugMessage("Purchase Started")
+
+                    let result = try await product.purchase(options: options)
+                    switch result {
+                    case .success(let verification):
+                        debugMessage("Purchase Successful")
+
+                        // Check whether the transaction is verified. If it isn't,
+                        // this function rethrows the verification error.
+                        let transaction = try checkVerified(verification)
+
+                        // The transaction is verified. Deliver content to the user.
+                        // Do on JS :await updateCustomerProductStatus()
+
+                        // Always finish a transaction.
+                        if andDangerouslyFinishTransactionAutomatically {
+                            await transaction.finish()
+                            resolve(nil)
+                        } else {
+                            self.addTransaction(transaction)
+                            resolve(serialize(transaction))
+                        }
+                        return
+
+                    case .userCancelled, .pending:
+                        debugMessage("Deferred (awaiting approval via parental controls, etc.)")
 
-                let result = try await product.purchase(options: options)
-                switch result {
-                case .success(let verification):
-                    debugMessage("Purchase Successful")
+                        let err = [
+                            "debugMessage": "The payment was deferred (awaiting approval via parental controls for instance)",
+                            "code": IapErrors.E_DEFERRED_PAYMENT.rawValue,
+                            "message": "The payment was deferred (awaiting approval via parental controls for instance)",
+                            "productId": sku,
+                            "quantity": "\(quantity)"
+                        ]
+                        debugMessage(err)
 
-                    // Check whether the transaction is verified. If it isn't,
-                    // this function rethrows the verification error.
-                    let transaction = try checkVerified(verification)
+                        reject(
+                            IapErrors.E_DEFERRED_PAYMENT.rawValue,
+                            "The payment was deferred for \(sku) (awaiting approval via parental controls for instance)",
+                            nil)
 
-                    // The transaction is verified. Deliver content to the user.
-                    // Do on JS :await updateCustomerProductStatus()
+                        return
 
-                    // Always finish a transaction.
-                    if andDangerouslyFinishTransactionAutomatically {
-                        await transaction.finish()
-                        resolve(nil)
-                    } else {
-                        self.addTransaction(transaction)
-                        resolve(serialize(transaction))
+                    default:
+                        reject(IapErrors.E_UNKNOWN.rawValue, "Unknown response from purchase", nil)
+                        return
                     }
-                    return
-
-                case .userCancelled, .pending:
-                    debugMessage("Deferred (awaiting approval via parental controls, etc.)")
+                } catch {
+                    debugMessage("Purchase Failed")
 
                     let err = [
-                        "debugMessage": "The payment was deferred (awaiting approval via parental controls for instance)",
-                        "code": IapErrors.E_DEFERRED_PAYMENT.rawValue,
-                        "message": "The payment was deferred (awaiting approval via parental controls for instance)",
-                        "productId": sku,
-                        "quantity": "\(quantity)"
+                        "responseCode": IapErrors.E_PURCHASE_ERROR.rawValue,
+                        "debugMessage": error.localizedDescription,
+                        "message": error.localizedDescription,
+                        "productId": sku
                     ]
-                    debugMessage(err)
+                    print(err)
 
                     reject(
-                        IapErrors.E_DEFERRED_PAYMENT.rawValue,
-                        "The payment was deferred for \(sku) (awaiting approval via parental controls for instance)",
-                        nil)
-
-                    return
-
-                default:
-                    reject(IapErrors.E_UNKNOWN.rawValue, "Unknown response from purchase", nil)
-                    return
+                        IapErrors.E_UNKNOWN.rawValue,
+                        "Purchased failed for sku:\(sku): \(error.localizedDescription)",
+                        error)
                 }
-            } catch {
-                debugMessage("Purchase Failed")
-
-                let err = [
-                    "responseCode": IapErrors.E_PURCHASE_ERROR.rawValue,
-                    "debugMessage": error.localizedDescription,
-                    "message": error.localizedDescription,
-                    "productId": sku
-                ]
-                print(err)
-
-                reject(
-                    IapErrors.E_UNKNOWN.rawValue,
-                    "Purchased failed for sku:\(sku): \(error.localizedDescription)",
-                    error)
+            } else {
+                reject("E_DEVELOPER_ERROR", "Invalid product ID.", nil)
             }
-        } else {
-            reject("E_DEVELOPER_ERROR", "Invalid product ID.", nil)
         }
     }
 
diff --git a/src/eventEmitter.ts b/src/eventEmitter.ts
index 71e1d2430..189f9a91c 100644
--- a/src/eventEmitter.ts
+++ b/src/eventEmitter.ts
@@ -9,12 +9,13 @@ const eventEmitter = new NativeEventEmitter(getNativeModule());
 
 /**
  * Add IAP purchase event
+ * TODO: Rename to transactionUpdatedListener
  */
 export const purchaseUpdatedListener = (
   listener: (event: Purchase) => void,
 ) => {
   const emitterSubscription = eventEmitter.addListener(
-    'purchase-updated',
+    'transaction-updated',
     listener,
   );
 
diff --git a/src/hooks/useIAP.ts b/src/hooks/useIAP.ts
index 9bf8df27a..7966948e2 100644
--- a/src/hooks/useIAP.ts
+++ b/src/hooks/useIAP.ts
@@ -15,7 +15,6 @@ import {useIAPContext} from './withIAPContext';
 type IAP_STATUS = {
   connected: boolean;
   products: Product[];
-  promotedProductsIOS: Product[];
   subscriptions: Subscription[];
   purchaseHistory: Purchase[];
   availablePurchases: Purchase[];
@@ -41,7 +40,6 @@ export function useIAP(): IAP_STATUS {
   const {
     connected,
     products,
-    promotedProductsIOS,
     subscriptions,
     purchaseHistory,
     availablePurchases,
@@ -58,7 +56,9 @@ export function useIAP(): IAP_STATUS {
 
   const getProducts = useCallback(
     async ({skus}: {skus: string[]}): Promise<void> => {
-      setProducts(await iapGetProducts({skus}));
+      const prods = await iapGetProducts({skus});
+      console.log(prods);
+      setProducts(prods);
     },
     [setProducts],
   );
@@ -117,7 +117,6 @@ export function useIAP(): IAP_STATUS {
   return {
     connected,
     products,
-    promotedProductsIOS,
     subscriptions,
     purchaseHistory,
     availablePurchases,
diff --git a/src/hooks/withIAPContext.tsx b/src/hooks/withIAPContext.tsx
index a07d0783a..d55f5b019 100644
--- a/src/hooks/withIAPContext.tsx
+++ b/src/hooks/withIAPContext.tsx
@@ -1,11 +1,7 @@
 import React, {useContext, useEffect, useMemo, useState} from 'react';
 
-import {
-  promotedProductListener,
-  purchaseErrorListener,
-  purchaseUpdatedListener,
-} from '../eventEmitter';
-import {getPromotedProductIOS, initConnection} from '../iap';
+import {purchaseErrorListener, purchaseUpdatedListener} from '../eventEmitter';
+import {initConnection} from '../iap';
 import type {PurchaseError} from '../purchaseError';
 import type {
   Product,
@@ -18,7 +14,6 @@ import type {
 type IAPContextType = {
   connected: boolean;
   products: Product[];
-  promotedProductsIOS: Product[];
   subscriptions: Subscription[];
   purchaseHistory: Purchase[];
   availablePurchases: Purchase[];
@@ -52,10 +47,6 @@ 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[]>([]);
 
@@ -74,7 +65,6 @@ export function withIAPContext<T>(Component: React.ComponentType<T>) {
         connected,
         products,
         subscriptions,
-        promotedProductsIOS,
         purchaseHistory,
         availablePurchases,
         currentPurchase,
@@ -91,7 +81,6 @@ export function withIAPContext<T>(Component: React.ComponentType<T>) {
         connected,
         products,
         subscriptions,
-        promotedProductsIOS,
         purchaseHistory,
         availablePurchases,
         currentPurchase,
@@ -134,19 +123,9 @@ export function withIAPContext<T>(Component: React.ComponentType<T>) {
         },
       );
 
-      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 ab6d3a77a..da211443c 100644
--- a/src/iap.ts
+++ b/src/iap.ts
@@ -2,8 +2,6 @@ import {Linking, NativeModules, Platform} from 'react-native';
 
 import type * as Amazon from './types/amazon';
 import type * as Android from './types/android';
-import type * as Apple from './types/apple';
-import {ReceiptValidationStatus} from './types/apple';
 import {
   enhancedFetch,
   fillProductsWithAdditionalData,
@@ -114,10 +112,7 @@ export const getProducts = ({
       ios: async () => {
         const items = await getIosModule().getItems(skus);
 
-        return items.filter(
-          (item: Product) =>
-            skus.includes(item.productId) && item.type === 'iap',
-        );
+        return items.filter((item: Product) => item.subscription === null);
       },
       android: async () => {
         const products = await getAndroidModule().getItemsByType(
@@ -147,7 +142,7 @@ export const getSubscriptions = ({
 
         return items.filter(
           (item: Subscription) =>
-            skus.includes(item.productId) && item.type === 'subs',
+            skus.includes(item.id) && item.type === 'subs',
         );
       },
       android: async () => {
@@ -201,7 +196,7 @@ export const getAvailablePurchases = (): Promise<
   (
     Platform.select({
       ios: async () => {
-        return getIosModule().getAvailableItems();
+        return getIosModule().currentEntitlements();
       },
       android: async () => {
         if (RNIapAmazonModule) {
@@ -257,7 +252,7 @@ export const requestPurchase = ({
           sku,
           andDangerouslyFinishTransactionAutomaticallyIOS,
           appAccountToken,
-          quantity,
+          quantity ?? -1,
           withOffer,
         );
       },
@@ -396,16 +391,6 @@ export const finishTransaction = ({
   )();
 };
 
-/**
- * Clear Transaction (iOS only)
- *   Finish remaining transactions. Related to issue #257 and #801
- *     link : https://github.com/dooboolab/react-native-iap/issues/257
- *            https://github.com/dooboolab/react-native-iap/issues/801
- * @returns {Promise<void>}
- */
-export const clearTransactionIOS = (): Promise<void> =>
-  getIosModule().clearTransaction();
-
 /**
  * Acknowledge a product (on Android.) No-op on iOS.
  * @param {string} token The product's token (on Android)
@@ -438,93 +423,6 @@ export const deepLinkToSubscriptionsAndroid = async ({
   );
 };
 
-/**
- * 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> =>
-  getIosModule().promotedProduct();
-
-/**
- * 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();
-
-const fetchJsonOrThrow = async (
-  url: string,
-  receiptBody: Record<string, unknown>,
-): Promise<Apple.ReceiptValidationResponse | false> => {
-  const response = await fetch(url, {
-    method: 'POST',
-    headers: {
-      Accept: 'application/json',
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify(receiptBody),
-  });
-
-  if (!response.ok) {
-    throw Object.assign(new Error(response.statusText), {
-      statusCode: response.status,
-    });
-  }
-
-  return response.json();
-};
-
-const requestAgnosticReceiptValidationIos = async (
-  receiptBody: Record<string, unknown>,
-): Promise<Apple.ReceiptValidationResponse | false> => {
-  const response = await fetchJsonOrThrow(
-    'https://buy.itunes.apple.com/verifyReceipt',
-    receiptBody,
-  );
-
-  // Best practice is to check for test receipt and check sandbox instead
-  // https://developer.apple.com/documentation/appstorereceipts/verifyreceipt
-  if (response && response.status === ReceiptValidationStatus.TEST_RECEIPT) {
-    const testResponse = await enhancedFetch<Apple.ReceiptValidationResponse>(
-      'https://sandbox.itunes.apple.com/verifyReceipt',
-      {
-        method: 'POST',
-        body: receiptBody,
-      },
-    );
-
-    return testResponse;
-  }
-
-  return response;
-};
-
-/**
- * Validate receipt for iOS.
- * @param {object} receiptBody the receipt body to send to apple server.
- * @param {boolean} isTest whether this is in test environment which is sandbox.
- * @returns {Promise<Apple.ReceiptValidationResponse | false>}
- */
-export const validateReceiptIos = async ({
-  receiptBody,
-  isTest,
-}: {
-  receiptBody: Record<string, unknown>;
-  isTest?: boolean;
-}): Promise<Apple.ReceiptValidationResponse | false> => {
-  if (isTest == null) {
-    return await requestAgnosticReceiptValidationIos(receiptBody);
-  }
-
-  const url = isTest
-    ? 'https://sandbox.itunes.apple.com/verifyReceipt'
-    : 'https://buy.itunes.apple.com/verifyReceipt';
-
-  return await enhancedFetch<Apple.ReceiptValidationResponse>(url);
-};
-
 /**
  * Validate receipt for Android. NOTE: This method is here for debugging purposes only. Including
  * your access token in the binary you ship to users is potentially dangerous.
@@ -586,25 +484,6 @@ export const validateReceiptAmazon = async ({
   return await enhancedFetch<Amazon.ReceiptType>(url);
 };
 
-/**
- * Get the current receipt base64 encoded in IOS.
- * @param {forceRefresh?:boolean}
- * @returns {Promise<ProductPurchase[]>}
- */
-export const getPendingPurchasesIOS = async (): Promise<ProductPurchase[]> =>
-  getIosModule().getPendingTransactions();
-
-/**
- * Get the current receipt base64 encoded in IOS.
- * @param {forceRefresh?:boolean}
- * @returns {Promise<string>}
- */
-export const getReceiptIOS = async ({
-  forceRefresh,
-}: {
-  forceRefresh?: boolean;
-}): Promise<string> => getIosModule().requestReceipt(forceRefresh ?? false);
-
 /**
  * Launches a modal to register the redeem offer code in IOS.
  * @returns {Promise<null>}
diff --git a/src/types/index.ts b/src/types/index.ts
index fb321c9dd..b19503fef 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -26,7 +26,6 @@ export enum InstallSourceAndroid {
 
 export interface ProductCommon {
   type: 'subs' | 'sub' | 'inapp' | 'iap';
-  productId: string;
   productIds?: string[];
   title: string;
   description: string;
@@ -89,15 +88,21 @@ export interface Discount {
   subscriptionPeriod: string;
 }
 
-export interface Product extends ProductCommon {
+export interface ProductAndroid extends ProductCommon {
   type: 'inapp' | 'iap';
-  // Android V5
   oneTimePurchaseOfferDetails?: {
     priceCurrencyCode: string;
     formattedPrice: string;
     priceAmountMicros: string;
   };
 }
+export interface ProductIOS extends ProductCommon {
+  subscription: null;
+  id: string;
+  type: 'inapp' | 'iap';
+}
+
+export type Product = ProductAndroid & ProductIOS;
 
 // Android V5
 export interface SubscriptionAndroid extends ProductCommon {
@@ -125,7 +130,7 @@ export interface SubscriptionAndroid extends ProductCommon {
 
 export interface SubscriptionIOS extends ProductCommon {
   type: 'subs';
-
+  id: string;
   discounts?: Discount[];
   introductoryPrice?: string;
   introductoryPriceAsAmountIOS?: string;