From 7f9ff8efbfc9b79204eb004ece673594c96a6e20 Mon Sep 17 00:00:00 2001
From: Andres Aguilar <andresesfm@gmail.com>
Date: Wed, 24 Aug 2022 19:51:42 -0700
Subject: [PATCH] product purchase lifecycle (#1885)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ci: replace publication for next branch

* refactor!: create a PurchaseError class (#1866)

* refactor!: remove support for default export (#1864)

* chore: clean up non existing errors (#1868)

* chore: move some logic into internal files (#1871)

* refactor: extract event-emitter to specific file (#1872)

* refactor!: make all methods take an object of params (#1873)

* integrate ios storekit 2 (#1882)

* set min ios version to 15

* consolidated buy methods

* removed checks for older versions of ios

* cleared most errors

* swiftlint

* continue migration, purchases

* return promises to class

* moved utils to ios

* clean up promises and error codes

* serialized Transactions

* removed remaining old methods, added serialization

* default to Xcode 4 spaces

* Split files

* Added more transaction methods

* removed global autofinish

* fix lint on doc

Co-authored-by: Andres Aguilar <andres.aguilar@nfl.com>

* Able to purchase products

* swift lint

* fixed lint issues, removed methods

Co-authored-by: hyochan <dooboolab@gmail.com>
Co-authored-by: Jérémy Barbet <jeremgraph@gmail.com>
Co-authored-by: Andres Aguilar <andres.aguilar@nfl.com>
---
 .swiftlint.yml                                |    1 -
 IapExample/ios/Configuration.storekit         |   48 +
 .../ios/IapExample.xcodeproj/project.pbxproj  |    4 +
 .../xcschemes/IapExample.xcscheme             |    3 +
 IapExample/ios/Podfile                        |    2 +-
 IapExample/ios/Podfile.lock                   |    6 +-
 IapExample/src/screens/ClassSetup.tsx         |   16 +-
 IapExample/src/screens/Products.tsx           |   33 +-
 IapExample/src/screens/Subscriptions.tsx      |   11 +-
 RNIap.podspec                                 |    2 +-
 .../usage_instructions/receipt_validation.md  |   22 -
 ios/IapSerializationUtils.swift               |  111 ++
 ios/IapTypes.swift                            |   39 +
 ios/IapUtils.swift                            |   30 +
 ios/RNIapIos.m                                |   43 +-
 ios/RNIapIos.swift                            | 1275 +++++------------
 src/eventEmitter.ts                           |    3 +-
 src/hooks/useIAP.ts                           |    7 +-
 src/hooks/withIAPContext.tsx                  |   25 +-
 src/iap.ts                                    |  211 +--
 src/types/index.ts                            |   47 +-
 21 files changed, 697 insertions(+), 1242 deletions(-)
 create mode 100644 IapExample/ios/Configuration.storekit
 create mode 100644 ios/IapSerializationUtils.swift
 create mode 100644 ios/IapTypes.swift
 create mode 100644 ios/IapUtils.swift

diff --git a/.swiftlint.yml b/.swiftlint.yml
index ad9f471c7..cb1d5094d 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -6,6 +6,5 @@ opt_in_rules:
   - operator_usage_whitespace
   - redundant_type_annotation
 
-indentation: 2
 vertical_whitespace_closing_braces: true
 vertical_whitespace_opening_braces: true
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 b/IapExample/ios/Podfile
index 96cfc5e38..7728e563c 100644
--- a/IapExample/ios/Podfile
+++ b/IapExample/ios/Podfile
@@ -1,7 +1,7 @@
 require_relative '../node_modules/react-native/scripts/react_native_pods'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 
-platform :ios, '12.4'
+platform :ios, '15.0'
 install! 'cocoapods', :deterministic_uuids => false
 
 target 'IapExample' do
diff --git a/IapExample/ios/Podfile.lock b/IapExample/ios/Podfile.lock
index 9bbd26596..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 (8.6.5):
+  - RNIap (10.0.0):
     - React-Core
   - RNScreens (3.15.0):
     - React-Core
@@ -575,12 +575,12 @@ SPEC CHECKSUMS:
   ReactCommon: e30ec17dfb1d4c4f3419eac254350d6abca6d5a2
   RNCMaskedView: cb9670ea9239998340eaab21df13fa12a1f9de15
   RNGestureHandler: bad495418bcbd3ab47017a38d93d290ebd406f50
-  RNIap: e9f648d00e693913f80bbe5b661a5257fb72fe93
+  RNIap: 6f4925d680b31ff5d252f982aad12c8b66200b31
   RNScreens: 4a1af06327774490d97342c00aee0c2bafb497b7
   SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
   Yoga: 7ab6e3ee4ce47d7b789d1cb520163833e515f452
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: cfed50b11ea421296640e72457dcf62114e957f6
+PODFILE CHECKSUM: 47f330ba4aa0808e88cd2a085debf346af3dc659
 
 COCOAPODS: 1.11.3
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/RNIap.podspec b/RNIap.podspec
index 3e24142b2..e2a09726f 100644
--- a/RNIap.podspec
+++ b/RNIap.podspec
@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.license      = package["license"]
   s.authors      = package["author"]
 
-  s.platforms    = { :ios => "10.0" , :tvos => "10.0"}
+  s.platforms    = { :ios => "15.0" , :tvos => "15.0"}
   s.source       = { :git => "https://github.com/dooboolab/react-native-iap.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/*.{h,m,mm,swift}"
diff --git a/docs/docs/usage_instructions/receipt_validation.md b/docs/docs/usage_instructions/receipt_validation.md
index 5110f7bf5..f2c218c4b 100644
--- a/docs/docs/usage_instructions/receipt_validation.md
+++ b/docs/docs/usage_instructions/receipt_validation.md
@@ -57,28 +57,6 @@ flow) or unstable internet connections.
 For these cases we have a convenience method `getReceiptIOS()` which gets
 the latest receipt for the app at any given time. The response is base64 encoded.
 
-### iOS Purchasing process right way.
-
-Issue regarding `valid products`
-
-- In iOS, generally you are fetching valid products at App launching process.
-
-  If you fetch again, or fetch valid subscription, the products are added to
-  the array object in iOS side (Objective-C `NSMutableArray`).
-
-  This makes unexpected behavior when you fetch with a part of product lists.
-
-  For example, if you have products of `[A, B, C]`, and you call fetch function
-  with only `[A]`, this module returns `[A, B, C]`).
-
-  This is weird, but it works.
-
-- But, weird result is weird, so we made a new method which remove all valid products.
-
-  If you need to clear all products, subscriptions in that array, just call
-  `clearProductsIOS()`, and do the fetching job again, and you will receive what
-  you expected.
-
 ### Example backend (Node.js)
 
 [Here](https://github.com/mifi/in-app-subscription-example) you can find an example backend for idempotent validating of receipts on both iOS/Android and storing and serving subscription state to the client.
diff --git a/ios/IapSerializationUtils.swift b/ios/IapSerializationUtils.swift
new file mode 100644
index 000000000..c37886152
--- /dev/null
+++ b/ios/IapSerializationUtils.swift
@@ -0,0 +1,111 @@
+//
+//  IapSerializationUtils.swift
+//  RNIap
+//
+//  Created by Aguilar Andres on 8/18/22.
+//
+
+import Foundation
+import StoreKit
+
+func serialize(_ p: Product) -> [String: Any?] {
+    return ["displayName": p.displayName,
+            "description": p.description,
+            "id": p.id,
+            "displayPrice": p.displayPrice,
+            "price": p.price,
+            "isFamilyShareable": p.isFamilyShareable,
+            "jsonRepresentation": String( decoding: p.jsonRepresentation, as: UTF8.self),
+            // "debugDescription": p.debugDescription,
+            "subscription": serialize(p.subscription),
+            "type": serialize(p.type)
+    ]
+}
+
+func serialize(_ e: Error?) -> [String: Any?]? {
+    guard let e = e else {return nil}
+    return ["localizedDescription": e.localizedDescription]
+}
+
+func serialize(_ si: Product.SubscriptionInfo?) -> [String: Any?]? {
+    guard let si = si else {return nil}
+    return [
+        "subscriptionGroupID": si.subscriptionGroupID,
+        "promotionalOffers": si.promotionalOffers.map {(offer: Product.SubscriptionOffer) in serialize(offer)},
+        "introductoryOffer": serialize(si.introductoryOffer),
+        "subscriptionPeriod": si.subscriptionPeriod
+    ]
+}
+
+func serialize(_ so: Product.SubscriptionOffer?) -> [String: Any?]? {
+    guard let so = so else {return nil}
+    return [
+        "id": so.id,
+        "price": so.price,
+        "displayPrice": so.displayPrice,
+        "type": so.type,
+        "paymentMode": so.paymentMode,
+        "period": so.period,
+        "periodCount": so.periodCount
+    ]
+}
+
+// Transaction
+func serialize(_ t: Transaction) -> [String: Any?] {
+    return ["id": t.id,
+            "appBundleID": t.appBundleID,
+            "offerID": t.offerID,
+            "subscriptionGroupID": t.subscriptionGroupID,
+            "appAccountToken": t.appAccountToken,
+            // "debugDescription": t.debugDescription,
+            "deviceVerification": t.deviceVerification,
+            "deviceVerificationNonce": t.deviceVerificationNonce,
+            "expirationDate": t.expirationDate,
+            "isUpgraded": t.isUpgraded,
+            "jsonRepresentation": t.jsonRepresentation,
+            "offerType": serialize(t.offerType),
+            "expirationDate": t.expirationDate,
+            "originalID": t.originalID,
+            "originalPurchaseDate": t.originalPurchaseDate,
+            "ownershipType": serialize(t.ownershipType),
+            "productType": serialize(t.productType),
+            "productID": t.productID,
+            "purchasedQuantity": t.purchasedQuantity,
+            "revocationDate": t.revocationDate,
+            "revocationReason": t.revocationReason,
+            "purchaseDate": t.purchaseDate,
+            "signedDate": t.signedDate,
+            "webOrderLineItemID": t.webOrderLineItemID
+    ]
+}
+
+func serialize(_ ot: Transaction.OfferType?) -> String? {
+    guard let ot = ot else {return nil}
+    switch ot {
+    case .promotional: return "promotional"
+    case .introductory: return "introductory"
+    case .code: return "code"
+    default:
+        return nil
+    }
+}
+func serialize(_ ot: Transaction.OwnershipType?) -> String? {
+    guard let ot = ot else {return nil}
+    switch ot {
+    case .purchased: return "purchased"
+    case .familyShared: return "familyShared"
+    default:
+        return nil
+    }
+}
+func serialize(_ pt: Product.ProductType?) -> String? {
+    guard let pt = pt else {return nil}
+    switch pt {
+    case .autoRenewable: return "autoRenewable"
+    case .consumable: return "consumable"
+    case .nonConsumable: return "nonConsumable"
+    case .nonRenewable: return "nonRenewable"
+    default:
+        return nil
+    }
+}
diff --git a/ios/IapTypes.swift b/ios/IapTypes.swift
new file mode 100644
index 000000000..93e6e752a
--- /dev/null
+++ b/ios/IapTypes.swift
@@ -0,0 +1,39 @@
+//
+//  IapTypes.swift
+//  RNIap
+//
+//  Created by Aguilar Andres on 8/18/22.
+//
+
+import Foundation
+import StoreKit
+
+typealias RNIapIosPromise = (RCTPromiseResolveBlock, RCTPromiseRejectBlock)
+
+struct ProductOrError {
+    let product: Product?
+    let error: Error?
+}
+
+public enum StoreError: Error {
+    case failedVerification
+}
+
+enum IapErrors: String, CaseIterable {
+    case E_UNKNOWN = "E_UNKNOWN"
+    case E_SERVICE_ERROR = "E_SERVICE_ERROR"
+    case E_USER_CANCELLED = "E_USER_CANCELLED"
+    case E_USER_ERROR = "E_USER_ERROR"
+    case E_ITEM_UNAVAILABLE = "E_ITEM_UNAVAILABLE"
+    case E_REMOTE_ERROR = "E_REMOTE_ERROR"
+    case E_NETWORK_ERROR = "E_NETWORK_ERROR"
+    case E_RECEIPT_FAILED = "E_RECEIPT_FAILED"
+    case E_RECEIPT_FINISHED_FAILED = "E_RECEIPT_FINISHED_FAILED"
+    case E_DEVELOPER_ERROR = "E_DEVELOPER_ERROR"
+    case E_PURCHASE_ERROR = "E_PURCHASE_ERROR"
+    case E_SYNC_ERROR = "E_SYNC_ERROR"
+    case E_DEFERRED_PAYMENT = "E_DEFERRED_PAYMENT"
+    func asInt() -> Int {
+        return IapErrors.allCases.firstIndex(of: self)!
+    }
+}
diff --git a/ios/IapUtils.swift b/ios/IapUtils.swift
new file mode 100644
index 000000000..e5fbbdab8
--- /dev/null
+++ b/ios/IapUtils.swift
@@ -0,0 +1,30 @@
+//
+//  IapUtils.swift
+//  RNIap
+//
+//  Created by Aguilar Andres on 8/15/22.
+//
+
+import Foundation
+import StoreKit
+
+public func debugMessage(_ object: Any...) {
+    #if DEBUG
+    for item in object {
+        print("[react-native-iap] \(item)")
+    }
+    #endif
+}
+
+func checkVerified<T>(_ result: VerificationResult<T>) throws -> T {
+    // Check whether the JWS passes StoreKit verification.
+    switch result {
+    case .unverified:
+        // StoreKit parses the JWS, but it fails verification.
+        throw StoreError.failedVerification
+
+    case .verified(let safe):
+        // The result is verified. Return the unwrapped value.
+        return safe
+    }
+}
diff --git a/ios/RNIapIos.m b/ios/RNIapIos.m
index f7882219e..bcbb3a177 100644
--- a/ios/RNIapIos.m
+++ b/ios/RNIapIos.m
@@ -17,53 +17,44 @@ @interface RCT_EXTERN_MODULE (RNIapIos, NSObject)
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(getAvailableItems:
+RCT_EXTERN_METHOD(currentEntitlements:
                   (RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(buyProduct:
                   (NSString*)sku
                   andDangerouslyFinishTransactionAutomatically:(BOOL)andDangerouslyFinishTransactionAutomatically
-                  applicationUsername:(NSString*)applicationUsername
-                  resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(buyProductWithOffer:
-                  (NSString*)sku
-                  forUser:(NSString*)usernameHash
-                  withOffer:(NSDictionary*)discountOffer
-                  resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(buyProductWithQuantityIOS:
-                  (NSString*)sku
+                  appAccountToken:(NSString*)appAccountToken
                   quantity:(NSInteger)quantity
+                  withOffer:(NSDictionary*)withOffer
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(clearTransaction:
-                  (RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(clearProducts:
-                  (RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(promotedProduct:
-                  (RCTPromiseResolveBlock)resolve
+RCT_EXTERN_METHOD(isEligibleForIntroOffer:
+                  (NSString*)groupID
+                  resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(buyPromotedProduct:(RCTPromiseResolveBlock)resolve
+RCT_EXTERN_METHOD(currentEntitlement:
+                  (NSString*)sku
+                  resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(requestReceipt:
-                  (BOOL)refresh
+RCT_EXTERN_METHOD(latestTransaction:
+                  (NSString*)sku
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
+
 RCT_EXTERN_METHOD(finishTransaction:
                   (NSString*)transactionIdentifier
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(getPendingTransactions:
+RCT_EXTERN_METHOD(pendingTransactions:
+                  (RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(sync:
                   (RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
diff --git a/ios/RNIapIos.swift b/ios/RNIapIos.swift
index ed9c075f3..37dbff4ca 100644
--- a/ios/RNIapIos.swift
+++ b/ios/RNIapIos.swift
@@ -1,970 +1,405 @@
+import Foundation
 import React
 import StoreKit
 
-typealias RNIapIosPromise = (RCTPromiseResolveBlock, RCTPromiseRejectBlock)
-
-public func debugMessage(_ object: Any...) {
-  #if DEBUG
-  for item in object {
-    print("[react-native-iap] \(item)")
-  }
-  #endif
-}
-
-// Based on https://stackoverflow.com/a/40135192/570612
-extension Date {
-  var millisecondsSince1970: Int64 {
-    return Int64((self.timeIntervalSince1970 * 1000.0).rounded())
-  }
-
-  var millisecondsSince1970String: String {
-    return String((self.timeIntervalSince1970 * 1000.0).rounded())
-  }
-
-  init(milliseconds: Int64) {
-    self = Date(timeIntervalSince1970: TimeInterval(milliseconds) / 1000)
-  }
-}
-
 extension SKProductsRequest {
-  var key: String {
-    return String(self.hashValue)
-  }
+    var key: String {
+        return String(self.hashValue)
+    }
 }
 
 @objc(RNIapIos)
-class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver, SKProductsRequestDelegate {
-  private var promisesByKey: [String: [RNIapIosPromise]]
-  private var myQueue: DispatchQueue
-  private var hasListeners = false
-  private var pendingTransactionWithAutoFinish = false
-  private var receiptBlock: ((Data?, Error?) -> Void)? // Block to handle request the receipt async from delegate
-  private var validProducts: [SKProduct]
-  private var promotedPayment: SKPayment?
-  private var promotedProduct: SKProduct?
-  private var productsRequest: SKProductsRequest?
-  private var countPendingTransaction: Int = 0
-  private var hasTransactionObserver = false
-
-  override init() {
-    promisesByKey = [String: [RNIapIosPromise]]()
-    pendingTransactionWithAutoFinish = false
-    myQueue = DispatchQueue(label: "reject")
-    validProducts = [SKProduct]()
-    super.init()
-    addTransactionObserver()
-  }
-
-  deinit {
-    removeTransactionObserver()
-  }
-
-  override class func requiresMainQueueSetup() -> Bool {
-    return true
-  }
-
-  func addTransactionObserver() {
-    if !hasTransactionObserver {
-      hasTransactionObserver = true
-      SKPaymentQueue.default().add(self)
-    }
-  }
-
-  func removeTransactionObserver() {
-    if hasTransactionObserver {
-      hasTransactionObserver = false
-      SKPaymentQueue.default().remove(self)
-    }
-  }
-
-  func flushUnheardEvents() {
-    paymentQueue(SKPaymentQueue.default(), updatedTransactions: SKPaymentQueue.default().transactions)
-  }
-
-  override func startObserving() {
-    hasListeners = true
-    flushUnheardEvents()
-  }
+class RNIapIos: RCTEventEmitter, SKRequestDelegate {
+    private var hasListeners = false
+    private var products: [String: Product]
+    private var transactions: [String: Transaction]
+    private var updateListenerTask: Task<Void, Error>?
 
-  override func stopObserving() {
-    hasListeners = false
-  }
-
-  override func addListener(_ eventName: String?) {
-    super.addListener(eventName)
-
-    if (eventName == "iap-promoted-product") && promotedPayment != nil {
-      sendEvent(withName: "iap-promoted-product", body: promotedPayment?.productIdentifier)
+    override init() {
+        products = [String: Product]()
+        transactions = [String: Transaction]()
+        super.init()
+        addTransactionObserver()
     }
-  }
-
-  func addPromise(forKey key: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
-    var promises: [RNIapIosPromise]? = promisesByKey[key]
-
-    if promises == nil {
-      promises = []
-    }
-
-    promises?.append((resolve, reject))
-    promisesByKey[key] = promises
-  }
-
-  func resolvePromises(forKey key: String?, value: Any?) {
-    let promises: [RNIapIosPromise]? = promisesByKey[key ?? ""]
 
-    if let promises = promises {
-      for tuple in promises {
-        let resolveBlck = tuple.0
-        resolveBlck(value)
-      }
-      promisesByKey[key ?? ""] = nil
+    deinit {
+        removeTransactionObserver()
     }
-  }
 
-  func rejectPromises(forKey key: String, code: String?, message: String?, error: Error?) {
-    let promises = promisesByKey[key]
-
-    if let promises = promises {
-      for tuple in promises {
-        let reject = tuple.1
-        reject(code, message, error)
-      }
-      promisesByKey[key] = nil
-    }
-  }
-
-  func paymentQueue(_ queue: SKPaymentQueue, shouldAddStorePayment payment: SKPayment, for product: SKProduct) -> Bool {
-    promotedProduct = product
-    promotedPayment = payment
-
-    if hasListeners {
-      sendEvent(withName: "iap-promoted-product", body: product.productIdentifier)
-    }
-    return false
-  }
-
-  override func supportedEvents() -> [String]? {
-    return ["iap-promoted-product", "purchase-updated", "purchase-error"]
-  }
-
-  @objc public func initConnection(
-    _ resolve: @escaping RCTPromiseResolveBlock = { _ in },
-    reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
-  ) {
-    addTransactionObserver()
-    let canMakePayments = SKPaymentQueue.canMakePayments()
-    resolve(NSNumber(value: canMakePayments))
-  }
-  @objc public func endConnection(
-    _ resolve: @escaping RCTPromiseResolveBlock = { _ in },
-    reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
-  ) {
-    removeTransactionObserver()
-    resolve(nil)
-  }
-  @objc public func getItems(
-    _ skus: [String],
-    resolve: @escaping RCTPromiseResolveBlock = { _ in },
-    reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
-  ) {
-    let productIdentifiers = Set<AnyHashable>(skus)
-    if let productIdentifiers = productIdentifiers as? Set<String> {
-      productsRequest = SKProductsRequest(productIdentifiers: productIdentifiers)
-      if let productsRequest = productsRequest {
-        productsRequest.delegate = self
-        let key: String = productsRequest.key
-        addPromise(forKey: key, resolve: resolve, reject: reject)
-        productsRequest.start()
-      }
-    }
-  }
-  @objc public func getAvailableItems(
-    _ resolve: @escaping RCTPromiseResolveBlock = { _ in },
-    reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
-  ) {
-    addPromise(forKey: "availableItems", resolve: resolve, reject: reject)
-    SKPaymentQueue.default().restoreCompletedTransactions()
-  }
-
-  @objc public func buyProduct(
-    _ sku: String,
-    andDangerouslyFinishTransactionAutomatically: Bool,
-    applicationUsername: String?,
-    resolve: @escaping RCTPromiseResolveBlock = { _ in },
-    reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
-  ) {
-    pendingTransactionWithAutoFinish = andDangerouslyFinishTransactionAutomatically
-    var product: SKProduct?
-    let lockQueue = DispatchQueue(label: "validProducts")
-    lockQueue.sync {
-      for p in validProducts {
-        if sku == p.productIdentifier {
-          product = p
-          break
-        }
-      }
-    }
-    if let prod = product {
-      addPromise(forKey: prod.productIdentifier, resolve: resolve, reject: reject)
-
-      let payment = SKMutablePayment(product: prod)
-
-      if let applicationUsername = applicationUsername {
-        payment.applicationUsername = applicationUsername
-      }
-      SKPaymentQueue.default().add(payment)
-    } else {
-      if hasListeners {
-        let err = [
-          "debugMessage": "Invalid product ID.",
-          "code": "E_DEVELOPER_ERROR",
-          "message": "Invalid product ID.",
-          "productId": sku
-        ]
-
-        sendEvent(withName: "purchase-error", body: err)
-      }
-
-      reject("E_DEVELOPER_ERROR", "Invalid product ID.", nil)
+    override class func requiresMainQueueSetup() -> Bool {
+        return true
     }
-  }
-
-  @objc public func buyProductWithOffer(
-    _ sku: String,
-    forUser usernameHash: String,
-    withOffer discountOffer: [String: String],
-    resolve: @escaping RCTPromiseResolveBlock = { _ in },
-    reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
-  ) {
-    var product: SKProduct?
-    let lockQueue = DispatchQueue(label: "validProducts")
-    lockQueue.sync {
-      for p in validProducts {
-        if sku == p.productIdentifier {
-          product = p
-          break
+    func addTransactionObserver() {
+        if updateListenerTask == nil {
+            updateListenerTask = listenForTransactions()
         }
-      }
     }
 
-    if let prod = product {
-      addPromise(forKey: prod.productIdentifier, resolve: resolve, reject: reject)
-
-      let payment = SKMutablePayment(product: prod)
-
-      if #available(iOS 12.2, tvOS 12.2, *) {
-        let discount = SKPaymentDiscount(
-          identifier: discountOffer["identifier"]!,
-          keyIdentifier: discountOffer["keyIdentifier"]!,
-          nonce: UUID(uuidString: discountOffer["nonce"]!)!,
-          signature: discountOffer["signature"]!,
-          timestamp: NSNumber(value: Int(discountOffer["timestamp"]!)!))
-        payment.paymentDiscount = discount
-      }
-      payment.applicationUsername = usernameHash
-      SKPaymentQueue.default().add(payment)
-    } else {
-      if hasListeners {
-        let err = [
-          "debugMessage": "Invalid product ID.",
-          "message": "Invalid product ID.",
-          "code": "E_DEVELOPER_ERROR",
-          "productId": sku
-        ]
-        sendEvent(withName: "purchase-error", body: err)
-      }
-      reject("E_DEVELOPER_ERROR", "Invalid product ID.", nil)
-    }
-  }
-
-  @objc public func buyProductWithQuantityIOS(
-    _ sku: String,
-    quantity: Int,
-    resolve: @escaping RCTPromiseResolveBlock = { _ in },
-    reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
-  ) {
-    debugMessage("buyProductWithQuantityIOS")
-    var product: SKProduct?
-    let lockQueue = DispatchQueue(label: "validProducts")
-    lockQueue.sync {
-      for p in validProducts {
-        if sku == p.productIdentifier {
-          product = p
-          break
+    func removeTransactionObserver() {
+        updateListenerTask?.cancel()
+        updateListenerTask = nil
+    }
+
+    func addTransaction(_ transaction: Transaction) {
+        let transactionId = String(transaction.id)
+        self.transactions[transactionId] = transaction
+    }
+
+    func listenForTransactions() -> Task<Void, Error> {
+        return Task.detached {
+            // Iterate through any transactions that don't come from a direct call to `purchase()`.
+            for await result in Transaction.updates {
+                do {
+                    let transaction = try checkVerified(result)
+                    self.addTransaction(transaction)
+                    // Deliver products to the user.
+                    // await self.updateCustomerProductStatus()
+
+                    if self.hasListeners {
+                        self.sendEvent(withName: "transaction-updated", body: ["transaction": serialize(transaction)])
+                    }
+                    // Always finish a transaction.
+                    // await transaction.finish() //TODO: Document
+                } catch {
+                    // StoreKit has a transaction that fails verification. Don't deliver content to the user.
+                    debugMessage("Transaction failed verification")
+                    if self.hasListeners {
+                        let err = [
+                            "responseCode": "-1",
+                            "debugMessage": error.localizedDescription,
+                            "code": "E_RECEIPT_FINISHED_FAILED",
+                            "message": error.localizedDescription
+                        ]
+
+                        self.sendEvent(withName: "transaction-updated", body: ["error": err])
+                    }
+                }
+            }
         }
-      }
-    }
-    if let prod = product {
-      let payment = SKMutablePayment(product: prod)
-      payment.quantity = quantity
-      SKPaymentQueue.default().add(payment)
-    } else {
-      if hasListeners {
-        let err = [
-          "debugMessage": "Invalid product ID.",
-          "message": "Invalid product ID.",
-          "code": "E_DEVELOPER_ERROR",
-          "productId": sku
-        ]
-        sendEvent(withName: "purchase-error", body: err)
-      }
-      reject("E_DEVELOPER_ERROR", "Invalid product ID.", nil)
     }
-  }
-
-  @objc public func clearTransaction(
-    _ resolve: @escaping RCTPromiseResolveBlock = { _ in },
-    reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
-  ) {
-    let pendingTrans = SKPaymentQueue.default().transactions
-    countPendingTransaction = pendingTrans.count
-
-    debugMessage("clear remaining Transactions (\(countPendingTransaction)). Call this before make a new transaction")
-
-    if countPendingTransaction > 0 {
-      addPromise(forKey: "cleaningTransactions", resolve: resolve, reject: reject)
-      for transaction in pendingTrans {
-        SKPaymentQueue.default().finishTransaction(transaction)
-      }
-    } else {
-      resolve(nil)
-    }
-  }
-
-  @objc public func clearProducts(
-    _ resolve: @escaping RCTPromiseResolveBlock = { _ in },
-    reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
-  ) {
-    debugMessage("clear valid products")
-
-    let lockQueue = DispatchQueue(label: "validProducts")
 
-    lockQueue.sync {
-      validProducts.removeAll()
+    override func startObserving() {
+        hasListeners = true
     }
 
-    resolve(nil)
-  }
-
-  @objc public func  promotedProduct(
-    _ resolve: @escaping RCTPromiseResolveBlock = { _ in },
-    reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
-  ) {
-    debugMessage("get promoted product")
-    resolve((promotedProduct != nil) ? getProductObject(promotedProduct!) : nil)
-  }
-
-  @objc public func  buyPromotedProduct(
-    _ resolve: @escaping RCTPromiseResolveBlock = { _ in },
-    reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
-  ) {
-    if let promoPayment = promotedPayment {
-      debugMessage("buy promoted product")
-      SKPaymentQueue.default().add(promoPayment)
-    } else {
-      reject("E_DEVELOPER_ERROR", "Invalid product ID.", nil)
+    override func stopObserving() {
+        hasListeners = false
     }
-  }
-
-  @objc public func  requestReceipt(
-    _ refresh: Bool,
-    resolve: @escaping RCTPromiseResolveBlock = { _ in },
-    reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
-  ) {
-    requestReceiptData(withBlock: refresh) { [self] receiptData, error in
-      if error == nil {
-        resolve(receiptData?.base64EncodedString(options: []))
-      } else {
-        reject(standardErrorCode(9), "Invalid receipt", nil)
-      }
+    override func addListener(_ eventName: String?) {
+        super.addListener(eventName)
     }
-  }
-
-  @objc public func  finishTransaction(
-    _ transactionIdentifier: String,
-    resolve: @escaping RCTPromiseResolveBlock = { _ in },
-    reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
-  ) {
-    finishTransaction(withIdentifier: transactionIdentifier)
-    resolve(nil)
-  }
-
-  @objc public func getPendingTransactions (
-    _ resolve: @escaping RCTPromiseResolveBlock = { _ in },
-    reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
-  ) {
-    requestReceiptData(withBlock: false) { receiptData, _ in
-      var output: [AnyHashable] = []
-
-      if let receipt = receiptData {
-        let transactions = SKPaymentQueue.default().transactions
-
-        for item in transactions {
-          let timestamp = item.transactionDate?.millisecondsSince1970 == nil ? nil : String(item.transactionDate!.millisecondsSince1970)
-          let purchase = [
-            "transactionDate": timestamp,
-            "transactionId": item.transactionIdentifier,
-            "productId": item.payment.productIdentifier,
-            "quantity": "\(item.payment.quantity)",
-            "transactionReceipt": receipt.base64EncodedString(options: [])
-          ]
-
-          output.append(purchase)
-        }
-      }
-
-      resolve(output)
-    }
-  }
-
-  @objc public func  presentCodeRedemptionSheet(
-    _ resolve: @escaping RCTPromiseResolveBlock = { _ in },
-    reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
-  ) {
-    #if !os(tvOS)
-    if #available(iOS 14.0, tvOS 14.0, *) {
-      SKPaymentQueue.default().presentCodeRedemptionSheet()
-      resolve(nil)
-    } else {
-      reject(standardErrorCode(2), "This method only available above iOS 14", nil)
-    }
-    #else
-    reject(standardErrorCode(2), "This method is not available on tvOS", nil)
-    #endif
-  }
-
-  // StoreKitDelegate
-  func productsRequest(_ request: SKProductsRequest, didReceive response: SKProductsResponse) {
-    for prod in response.products {
-      add(prod)
-    }
-
-    var items: [[String: Any?]] = [[:]]
-    let lockQueue = DispatchQueue(label: "validProducts")
 
-    lockQueue.sync {
-      for product in validProducts {
-        items.append(getProductObject(product))
-      }
+    override func supportedEvents() -> [String]? {
+        return [ "transaction-updated"]
     }
 
-    resolvePromises(forKey: request.key, value: items)
-  }
-
-  // Add to valid products from Apple server response. Allowing getProducts, getSubscriptions call several times.
-  // Doesn't allow duplication. Replace new product.
-  func add(_ aProd: SKProduct) {
-    let lockQueue = DispatchQueue(label: "validProducts")
-
-    lockQueue.sync {
-      debugMessage("Add new object: \(aProd.productIdentifier)")
-      var delTar = -1
-
-      for k in 0..<validProducts.count {
-        let cur = validProducts[k]
-        if cur.productIdentifier == aProd.productIdentifier {
-          delTar = k
-        }
-      }
-
-      if delTar >= 0 {
-        validProducts.remove(at: delTar)
-      }
-
-      validProducts.append(aProd)
+    @objc public func initConnection(
+        _ resolve: @escaping RCTPromiseResolveBlock = { _ in },
+        reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
+    ) {
+        addTransactionObserver()
+        resolve(AppStore.canMakePayments)
     }
-  }
-
-  func request(_ request: SKRequest, didFailWithError error: Error) {
-    let nsError = error as NSError
-
-    if request is SKReceiptRefreshRequest {
-      if let unwrappedReceiptBlock = receiptBlock {
-        let standardError = NSError(domain: nsError.domain, code: 9, userInfo: nsError.userInfo)
-        unwrappedReceiptBlock(nil, standardError)
-        receiptBlock = nil
-        return
-      } else {
-        if let key: String = productsRequest?.key {
-          myQueue.sync(execute: { [self] in
-                        rejectPromises(
-                          forKey: key,
-                          code: standardErrorCode(nsError.code),
-                          message: error.localizedDescription,
-                          error: error)}
-          )
-        }
-      }
+    @objc public func endConnection(
+        _ resolve: @escaping RCTPromiseResolveBlock = { _ in },
+        reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
+    ) {
+        updateListenerTask?.cancel()
+        updateListenerTask = nil
+        resolve(nil)
     }
-  }
-
-  func paymentQueue(_ queue: SKPaymentQueue, updatedTransactions transactions: [SKPaymentTransaction]) {
-    for transaction in transactions {
-      switch transaction.transactionState {
-      case .purchasing:
-        debugMessage("Purchase Started")
-        break
-
-      case .purchased:
-        debugMessage("Purchase Successful")
-        purchaseProcess(transaction)
-        break
-
-      case .restored:
-        debugMessage("Restored")
-        SKPaymentQueue.default().finishTransaction(transaction)
-        break
-
-      case .deferred:
-        debugMessage("Deferred (awaiting approval via parental controls, etc.)")
-
-        myQueue.sync(execute: { [self] in
-          if hasListeners {
-            let err = [
-              "debugMessage": "The payment was deferred (awaiting approval via parental controls for instance)",
-              "code": "E_DEFERRED_PAYMENT",
-              "message": "The payment was deferred (awaiting approval via parental controls for instance)",
-              "productId": transaction.payment.productIdentifier,
-              "quantity": "\(transaction.payment.quantity)"
-            ]
-
-            sendEvent(withName: "purchase-error", body: err)
-          }
-
-          rejectPromises(
-            forKey: transaction.payment.productIdentifier,
-            code: "E_DEFERRED_PAYMENT",
-            message: "The payment was deferred (awaiting approval via parental controls for instance)",
-            error: nil)
-        })
-
-      case .failed:
-        debugMessage("Purchase Failed")
-
-        SKPaymentQueue.default().finishTransaction(transaction)
-
-        myQueue.sync(execute: { [self] in
-          let nsError = transaction.error as NSError?
-
-          if hasListeners {
-            let code = nsError?.code
-            let responseCode = String(code ?? 0)
-            let err = [
-              "responseCode": responseCode,
-              "debugMessage": transaction.error?.localizedDescription,
-              "code": standardErrorCode(code),
-              "message": transaction.error?.localizedDescription,
-              "productId": transaction.payment.productIdentifier
-            ]
-
-            sendEvent(withName: "purchase-error", body: err)
-          }
-
-          rejectPromises(
-            forKey: transaction.payment.productIdentifier,
-            code: standardErrorCode(nsError?.code),
-            message: nsError?.localizedDescription,
-            error: nsError)
-        })
-
-        break
-      }
-    }
-  }
-
-  func finishTransaction(withIdentifier transactionIdentifier: String?) {
-    let queue = SKPaymentQueue.default()
-
-    for transaction in queue.transactions {
-      if transaction.transactionIdentifier == transactionIdentifier {
-        SKPaymentQueue.default().finishTransaction(transaction)
-      }
-    }
-  }
-
-  func paymentQueueRestoreCompletedTransactionsFinished(_ queue: SKPaymentQueue) {
-    debugMessage("PaymentQueueRestoreCompletedTransactionsFinished")
-    var items = [[String: Any?]]()
-
-    for transaction in queue.transactions {
-      if transaction.transactionState == .restored || transaction.transactionState == .purchased {
-        getPurchaseData(transaction) { restored in
-          if let restored = restored {
-            items.append(restored)
-          }
 
-          SKPaymentQueue.default().finishTransaction(transaction)
+    @objc public func getItems(
+        _ skus: [String],
+        resolve: @escaping RCTPromiseResolveBlock = { _ in },
+        reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
+    ) {
+        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)
+            }
         }
-      }
     }
 
-    resolvePromises(forKey: "availableItems", value: items)
-  }
-
-  func paymentQueue(_ queue: SKPaymentQueue, restoreCompletedTransactionsFailedWithError error: Error) {
-    myQueue.sync(execute: { [self] in
-      rejectPromises(
-        forKey: "availableItems",
-        code: standardErrorCode((error as NSError).code),
-        message: error.localizedDescription,
-        error: error)
-    })
-
-    debugMessage("restoreCompletedTransactionsFailedWithError")
-  }
-
-  func purchaseProcess(_ transaction: SKPaymentTransaction) {
-    if pendingTransactionWithAutoFinish {
-      SKPaymentQueue.default().finishTransaction(transaction)
-      pendingTransactionWithAutoFinish = false
-    }
-
-    getPurchaseData(transaction) { [self] purchase in
-      resolvePromises(forKey: transaction.payment.productIdentifier, value: purchase)
-
-      // additionally send event
-      if hasListeners {
-        sendEvent(withName: "purchase-updated", body: purchase)
-      }
-    }
-  }
-
-  func standardErrorCode(_ code: Int?) -> String? {
-    let descriptions = [
-      "E_UNKNOWN",
-      "E_SERVICE_ERROR",
-      "E_USER_CANCELLED",
-      "E_USER_ERROR",
-      "E_USER_ERROR",
-      "E_ITEM_UNAVAILABLE",
-      "E_REMOTE_ERROR",
-      "E_NETWORK_ERROR",
-      "E_SERVICE_ERROR",
-      "E_RECEIPT_FAILED",
-      "E_RECEIPT_FINISHED_FAILED"
-    ]
-
-    guard let code = code else {
-      return descriptions[0]
-    }
-
-    if code > descriptions.count - 1 || code < 0 { // Fix crash app without internet connection
-      return descriptions[0]
-    }
-
-    return descriptions[code]
-  }
-
-  func getProductObject(_ product: SKProduct) -> [String: Any?] {
-    let formatter = NumberFormatter()
-    formatter.numberStyle = .currency
-    formatter.locale = product.priceLocale
-
-    let localizedPrice = formatter.string(from: product.price)
-    var introductoryPrice = localizedPrice
-    var introductoryPriceAsAmountIOS = "\(product.price)"
-
-    var introductoryPricePaymentMode = ""
-    var introductoryPriceNumberOfPeriods = ""
-
-    var introductoryPriceSubscriptionPeriod = ""
-
-    var currencyCode: String? = ""
-    var countryCode: String? = ""
-    var periodNumberIOS = "0"
-    var periodUnitIOS = ""
-    var itemType = "iap"
-
-    if #available(iOS 11.2, tvOS 11.2, *) {
-      let numOfUnits = UInt(product.subscriptionPeriod?.numberOfUnits ?? 0)
-      let unit = product.subscriptionPeriod?.unit
-
-      if unit == .year {
-        periodUnitIOS = "YEAR"
-      } else if unit == .month {
-        periodUnitIOS = "MONTH"
-      } else if unit == .week {
-        periodUnitIOS = "WEEK"
-      } else if unit == .day {
-        periodUnitIOS = "DAY"
-      }
-
-      periodNumberIOS = String(format: "%lu", numOfUnits)
-      if numOfUnits != 0 {
-        itemType = "subs"
-      }
-
-      // subscriptionPeriod = product.subscriptionPeriod ? [product.subscriptionPeriod stringValue] : @"";
-      // introductoryPrice = product.introductoryPrice != nil ? [NSString stringWithFormat:@"%@", product.introductoryPrice] : @"";
-      if product.introductoryPrice != nil {
-        formatter.locale = product.introductoryPrice?.priceLocale
-
-        if let price = product.introductoryPrice?.price {
-          introductoryPrice = formatter.string(from: price)
-        }
-
-        introductoryPriceAsAmountIOS = product.introductoryPrice?.price.stringValue ?? ""
-
-        switch product.introductoryPrice?.paymentMode {
-        case .freeTrial:
-          introductoryPricePaymentMode = "FREETRIAL"
-          introductoryPriceNumberOfPeriods = NSNumber(value: product.introductoryPrice?.subscriptionPeriod.numberOfUnits ?? 0).stringValue
-
-        case .payAsYouGo:
-          introductoryPricePaymentMode = "PAYASYOUGO"
-          introductoryPriceNumberOfPeriods = NSNumber(value: product.introductoryPrice?.numberOfPeriods ?? 0).stringValue
-
-        case .payUpFront:
-          introductoryPricePaymentMode = "PAYUPFRONT"
-          introductoryPriceNumberOfPeriods = NSNumber(value: product.introductoryPrice?.subscriptionPeriod.numberOfUnits ?? 0).stringValue
-
-        default:
-          introductoryPricePaymentMode = ""
-          introductoryPriceNumberOfPeriods = "0"
+    @objc public func currentEntitlements(
+        _ resolve: @escaping RCTPromiseResolveBlock = { _ in },
+        reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
+    ) async {
+        var purchasedItems: [ProductOrError] = []
+        // Iterate through all of the user's purchased products.
+        for await result in Transaction.currentEntitlements {
+            do {
+                // Check whether the transaction is verified. If it isn’t, catch `failedVerification` error.
+                let transaction = try checkVerified(result)
+                // Check the `productType` of the transaction and get the corresponding product from the store.
+                switch transaction.productType {
+                case .nonConsumable:
+                    if let product = products[transaction.productID] {
+                        purchasedItems.append(ProductOrError(product: product, error: nil))
+                    }
+
+                case .nonRenewable:
+                    if let nonRenewable = products[transaction.productID] {
+                        // Non-renewing subscriptions have no inherent expiration date, so they're always
+                        // contained in `Transaction.currentEntitlements` after the user purchases them.
+                        // This app defines this non-renewing subscription's expiration date to be one year after purchase.
+                        // If the current date is within one year of the `purchaseDate`, the user is still entitled to this
+                        // product.
+                        let currentDate = Date()
+                        let expirationDate = Calendar(identifier: .gregorian).date(byAdding: DateComponents(year: 1),
+                                                                                   to: transaction.purchaseDate)!
+
+                        if currentDate < expirationDate {
+                            purchasedItems.append(ProductOrError(product: nonRenewable, error: nil))
+                        }
+                    }
+
+                case .autoRenewable:
+                    if let subscription = products[transaction.productID] {
+                        purchasedItems.append(ProductOrError(product: subscription, error: nil))
+                    }
+
+                default:
+                    break
+                }
+            } catch StoreError.failedVerification {
+                purchasedItems.append(ProductOrError(product: nil, error: StoreError.failedVerification))
+            } catch {
+                debugMessage(error)
+                purchasedItems.append(ProductOrError(product: nil, error: error))
+            }
         }
 
-        if product.introductoryPrice?.subscriptionPeriod.unit == .day {
-          introductoryPriceSubscriptionPeriod = "DAY"
-        } else if product.introductoryPrice?.subscriptionPeriod.unit == .week {
-          introductoryPriceSubscriptionPeriod = "WEEK"
-        } else if product.introductoryPrice?.subscriptionPeriod.unit == .month {
-          introductoryPriceSubscriptionPeriod = "MONTH"
-        } else if product.introductoryPrice?.subscriptionPeriod.unit == .year {
-          introductoryPriceSubscriptionPeriod = "YEAR"
-        } else {
-          introductoryPriceSubscriptionPeriod = ""
+        // Check the `subscriptionGroupStatus` to learn the auto-renewable subscription state to determine whether the customer
+        // is new (never subscribed), active, or inactive (expired subscription). This app has only one subscription
+        // group, so products in the subscriptions array all belong to the same group. The statuses that
+        // `product.subscription.status` returns apply to the entire subscription group.
+        // subscriptionGroupStatus = try? await subscriptions.first?.subscription?.status.first?.state
+        resolve(purchasedItems.map({(p: ProductOrError) in ["product": p.product.flatMap { serialize($0)}, "error": serialize(p.error)]}))
+    }
+
+    @objc public func buyProduct(
+        _ sku: String,
+        andDangerouslyFinishTransactionAutomatically: Bool,
+        appAccountToken: String?,
+        quantity: Int,
+        withOffer: [String: String],
+        resolve: @escaping RCTPromiseResolveBlock = { _ in },
+        reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
+    ) {
+        Task {
+            let product: Product? = products[sku]
+
+            if let product = product {
+                do {
+                    var options: Set<Product.PurchaseOption> = []
+                    if quantity > -1 {
+                        options.insert(.quantity(quantity))
+                    }
+
+                    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")
+
+                    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 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)
+
+                        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
+                    }
+                } 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 {
-        introductoryPrice = ""
-        introductoryPriceAsAmountIOS = ""
-        introductoryPricePaymentMode = ""
-        introductoryPriceNumberOfPeriods = ""
-        introductoryPriceSubscriptionPeriod = ""
-      }
-    }
-
-    if #available(iOS 10.0, tvOS 10.0, *) {
-      currencyCode = product.priceLocale.currencyCode
     }
 
-    if #available(iOS 13.0, tvOS 13.0, *) {
-      countryCode = SKPaymentQueue.default().storefront?.countryCode
-    } else if #available(iOS 10.0, tvOS 10.0, *) {
-      countryCode = product.priceLocale.regionCode
-    }
-
-    var discounts: [[String: String?]]?
-
-    if #available(iOS 12.2, tvOS 12.2, *) {
-      discounts = getDiscountData(product)
-    }
-
-    let obj: [String: Any?] = [
-      "productId": product.productIdentifier,
-      "price": "\(product.price)",
-      "currency": currencyCode,
-      "countryCode": countryCode ?? "",
-      "type": itemType,
-      "title": product.localizedTitle != "" ? product.localizedTitle : "",
-      "description": product.localizedDescription != "" ? product.localizedDescription : "",
-      "localizedPrice": localizedPrice,
-      "subscriptionPeriodNumberIOS": periodNumberIOS,
-      "subscriptionPeriodUnitIOS": periodUnitIOS,
-      "introductoryPrice": introductoryPrice,
-      "introductoryPriceAsAmountIOS": introductoryPriceAsAmountIOS,
-      "introductoryPricePaymentModeIOS": introductoryPricePaymentMode,
-      "introductoryPriceNumberOfPeriodsIOS": introductoryPriceNumberOfPeriods,
-      "introductoryPriceSubscriptionPeriodIOS": introductoryPriceSubscriptionPeriod,
-      "discounts": discounts
-    ]
-
-    return obj
-  }
-
-  func getDiscountData(_ product: SKProduct) -> [[String: String?]]? {
-    if #available(iOS 12.2, tvOS 12.2, *) {
-      var mappedDiscounts: [[String: String?]] = []
-      var localizedPrice: String?
-      var paymendMode: String?
-      var subscriptionPeriods: String?
-      var discountType: String?
-
-      for discount in product.discounts {
-        let formatter = NumberFormatter()
-        formatter.numberStyle = .currency
-        let priceLocale: Locale? = discount.priceLocale
-        if let pLocale = priceLocale {
-          formatter.locale = pLocale
-        }
-        localizedPrice = formatter.string(from: discount.price)
-        var numberOfPeriods: String?
-
-        switch discount.paymentMode {
-        case .freeTrial:
-          paymendMode = "FREETRIAL"
-          numberOfPeriods = NSNumber(value: discount.subscriptionPeriod.numberOfUnits ).stringValue
-          break
-
-        case .payAsYouGo:
-          paymendMode = "PAYASYOUGO"
-          numberOfPeriods = NSNumber(value: discount.numberOfPeriods).stringValue
-          break
-
-        case .payUpFront:
-          paymendMode = "PAYUPFRONT"
-          numberOfPeriods = NSNumber(value: discount.subscriptionPeriod.numberOfUnits ).stringValue
-          break
-
-        default:
-          paymendMode = ""
-          numberOfPeriods = "0"
-          break
-        }
-
-        switch discount.subscriptionPeriod.unit {
-        case .day:
-          subscriptionPeriods = "DAY"
-
-        case .week:
-          subscriptionPeriods = "WEEK"
-
-        case .month:
-          subscriptionPeriods = "MONTH"
-
-        case .year:
-          subscriptionPeriods = "YEAR"
-
-        default:
-          subscriptionPeriods = ""
-        }
-
-        let discountIdentifier = discount.identifier
-        switch discount.type {
-        case SKProductDiscount.Type.introductory:
-          discountType = "INTRODUCTORY"
-          break
-
-        case SKProductDiscount.Type.subscription:
-          discountType = "SUBSCRIPTION"
-          break
-
-        default:
-          discountType = ""
-          break
+    @objc public func isEligibleForIntroOffer( // TODO: new method
+        _ groupID: String,
+        resolve: @escaping RCTPromiseResolveBlock = { _ in },
+        reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
+    ) async {
+        let isEligibleForIntroOffer = await Product.SubscriptionInfo.isEligibleForIntroOffer(for: groupID)
+        resolve(isEligibleForIntroOffer)
+    }
+
+    @objc public func subscriptionStatus( // TODO: new method
+        _ sku: String,
+        resolve: @escaping RCTPromiseResolveBlock = { _ in },
+        reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
+    ) async {
+        do {
+            let status = try await products[sku]?.subscription?.status
+            resolve(status)
+        } catch {
+            reject("", "", error)
         }
-
-        let discountObj = [
-          "identifier": discountIdentifier,
-          "type": discountType,
-          "numberOfPeriods": numberOfPeriods,
-          "price": "\(discount.price)",
-          "localizedPrice": localizedPrice,
-          "paymentMode": paymendMode,
-          "subscriptionPeriod": subscriptionPeriods
-        ]
-
-        mappedDiscounts.append(discountObj)
-      }
-
-      return mappedDiscounts
     }
 
-    return nil
-  }
-
-  func getPurchaseData(_ transaction: SKPaymentTransaction, withBlock block: @escaping (_ transactionDict: [String: Any]?) -> Void) {
-    requestReceiptData(withBlock: false) { receiptData, _ in
-      if receiptData == nil {
-        block(nil)
-      } else {
-        var purchase = [
-          "transactionDate": transaction.transactionDate?.millisecondsSince1970String,
-          "transactionId": transaction.transactionIdentifier,
-          "productId": transaction.payment.productIdentifier,
-          "transactionReceipt": receiptData?.base64EncodedString(options: [])
-        ]
-
-        // originalTransaction is available for restore purchase and purchase of cancelled/expired subscriptions
-        if let originalTransaction = transaction.original {
-          purchase["originalTransactionDateIOS"] = originalTransaction.transactionDate?.millisecondsSince1970String
-          purchase["originalTransactionIdentifierIOS"] = originalTransaction.transactionIdentifier
+    @objc public func currentEntitlement( // TODO: new method
+        _ sku: String,
+        resolve: @escaping RCTPromiseResolveBlock = { _ in },
+        reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
+    ) async {
+        if let product = products[sku] {
+            if let result = await product.currentEntitlement {
+                do {
+                    // Check whether the transaction is verified. If it isn’t, catch `failedVerification` error.
+                    let transaction = try checkVerified(result)
+                    resolve(serialize(transaction))
+                } catch StoreError.failedVerification {
+                    reject(IapErrors.E_UNKNOWN.rawValue, "Failed to verify transaction for sku \(sku)", StoreError.failedVerification)
+                } catch {
+                    debugMessage(error)
+                    reject(IapErrors.E_UNKNOWN.rawValue, "Error fetching entitlement for sku \(sku)", error)
+                }
+            } else {
+                reject(IapErrors.E_DEVELOPER_ERROR.rawValue, "Can't find entitlement for sku \(sku)", nil)
+            }
+        } else {
+            reject(IapErrors.E_DEVELOPER_ERROR.rawValue, "Can't find product for sku \(sku)", nil)
         }
-
-        block(purchase as [String: Any])
-      }
-    }
-  }
-
-  func requestReceiptData(withBlock forceRefresh: Bool, withBlock block: @escaping (_ data: Data?, _ error: Error?) -> Void) {
-    debugMessage("requestReceiptDataWithBlock with force refresh: \(forceRefresh ? "YES" : "NO")")
-
-    if forceRefresh || isReceiptPresent() == false {
-      let refreshRequest = SKReceiptRefreshRequest()
-      refreshRequest.delegate = self
-      refreshRequest.start()
-      receiptBlock = block
-    } else {
-      receiptBlock = nil
-      block(receiptData(), nil)
     }
-  }
 
-  func isReceiptPresent() -> Bool {
-    let receiptURL = Bundle.main.appStoreReceiptURL
-    var canReachError: Error?
-
-    do {
-      try _ = receiptURL?.checkResourceIsReachable()
-    } catch let error {
-      canReachError = error
-    }
-
-    return canReachError == nil
-  }
-
-  func receiptData() -> Data? {
-    let receiptURL = Bundle.main.appStoreReceiptURL
-    var receiptData: Data?
-
-    if let receiptURL = receiptURL {
-      do {
-        try receiptData = Data(contentsOf: receiptURL)
-      } catch _ {
-      }
+    @objc public func latestTransaction( // TODO: new method
+        _ sku: String,
+        resolve: @escaping RCTPromiseResolveBlock = { _ in },
+        reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
+    ) async {
+        if let product = products[sku] {
+            if let result = await product.latestTransaction {
+                do {
+                    // Check whether the transaction is verified. If it isn’t, catch `failedVerification` error.
+                    let transaction = try checkVerified(result)
+                    resolve(serialize(transaction))
+                } catch StoreError.failedVerification {
+                    reject(IapErrors.E_UNKNOWN.rawValue, "Failed to verify transaction for sku \(sku)", StoreError.failedVerification)
+                } catch {
+                    debugMessage(error)
+                    reject(IapErrors.E_UNKNOWN.rawValue, "Error fetching latest transaction for sku \(sku)", error)
+                }
+            } else {
+                reject(IapErrors.E_DEVELOPER_ERROR.rawValue, "Can't find latest transaction for sku \(sku)", nil)
+            }
+        } else {
+            reject(IapErrors.E_DEVELOPER_ERROR.rawValue, "Can't find product for sku \(sku)", nil)
+        }
     }
 
-    return receiptData
-  }
-
-  func requestDidFinish(_ request: SKRequest) {
-    if request is SKReceiptRefreshRequest {
-      if isReceiptPresent() == true {
-        debugMessage("Receipt refreshed success")
-
-        if let receiptBlock = receiptBlock {
-          receiptBlock(receiptData(), nil)
+    @objc public func  finishTransaction(
+        _ transactionIdentifier: String,
+        resolve: @escaping RCTPromiseResolveBlock = { _ in },
+        reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
+    ) async {
+        await transactions[transactionIdentifier]?.finish()
+        transactions.removeValue(forKey: transactionIdentifier)
+        resolve(nil)
+    }
+
+    @objc public func pendingTransactions (
+        _ resolve: @escaping RCTPromiseResolveBlock = { _ in },
+        reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
+    ) {
+        resolve(transactions.values.map({(t: Transaction) in serialize(t)}))
+    }
+
+    // TODO: New method
+    @objc public func sync(
+        _ resolve: @escaping RCTPromiseResolveBlock = { _ in},
+        reject: @escaping RCTPromiseRejectBlock = {_, _, _ in}
+    ) async {
+        do {
+            try await AppStore.sync()
+        } catch {
+            reject(IapErrors.E_SYNC_ERROR.rawValue, "Error synchronizing with the AppStore", error)
         }
-      } else if let receiptBlock = receiptBlock {
-        debugMessage("Finished but receipt refreshed failed")
-
-        let error = NSError(domain: "Receipt request finished but it failed!", code: 10, userInfo: nil)
-        receiptBlock(nil, error)
-      }
-
-      receiptBlock = nil
     }
-  }
-
-  func paymentQueue(_ queue: SKPaymentQueue, removedTransactions transactions: [SKPaymentTransaction]) {
-    debugMessage("removedTransactions - countPendingTransactions \(countPendingTransaction)")
-
-    if countPendingTransaction > 0 {
-      countPendingTransaction -= transactions.count
 
-      if countPendingTransaction <= 0 {
-        resolvePromises(forKey: "cleaningTransactions", value: nil)
-        countPendingTransaction = 0
-      }
+    /**
+     Should remain the same according to:
+     https://stackoverflow.com/a/72789651/570612
+     */
+    @objc public func  presentCodeRedemptionSheet(
+        _ resolve: @escaping RCTPromiseResolveBlock = { _ in },
+        reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
+    ) {
+        #if !os(tvOS)
+        SKPaymentQueue.default().presentCodeRedemptionSheet()
+        resolve(nil)
+        #else
+        reject(standardErrorCode(2), "This method is not available on tvOS", nil)
+        #endif
     }
-  }
 }
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 3076e5b79..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,
@@ -13,11 +11,11 @@ import {
 import type {
   Product,
   ProductPurchase,
-  ProrationModesAndroid,
   PurchaseResult,
+  RequestPurchase,
+  RequestSubscription,
   Sku,
   Subscription,
-  SubscriptionOffer,
   SubscriptionPurchase,
 } from './types';
 import {InstallSourceAndroid, PurchaseStateAndroid} from './types';
@@ -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) {
@@ -224,7 +219,7 @@ export const getAvailablePurchases = (): Promise<
 /**
  * Request a purchase for product. This will be received in `PurchaseUpdatedListener`.
  * @param {string} sku The product's sku/ID
- * @param {string} [applicationUsername] The purchaser's user ID
+ * @param {string} [appAccountToken] UUID representing the purchaser
  * @param {boolean} [andDangerouslyFinishTransactionAutomaticallyIOS] You should set this to false and call finishTransaction manually when you have delivered the purchased goods to the user. It defaults to true to provide backwards compatibility. Will default to false in version 4.0.0.
  * @param {string} [obfuscatedAccountIdAndroid] Specifies an optional obfuscated string that is uniquely associated with the user's account in your app.
  * @param {string} [obfuscatedProfileIdAndroid] Specifies an optional obfuscated string that is uniquely associated with the user's profile in your app.
@@ -236,21 +231,14 @@ export const getAvailablePurchases = (): Promise<
 export const requestPurchase = ({
   sku,
   andDangerouslyFinishTransactionAutomaticallyIOS = false,
-  applicationUsername,
   obfuscatedAccountIdAndroid,
   obfuscatedProfileIdAndroid,
-  skus,
-  isOfferPersonalized,
-}: {
-  sku?: Sku;
-  andDangerouslyFinishTransactionAutomaticallyIOS?: boolean;
-  applicationUsername?: string;
-  obfuscatedAccountIdAndroid?: string;
-  obfuscatedProfileIdAndroid?: string;
-  /** For Google Play Billing Library 5 https://developer.android.com/google/play/billing/integrate#personalized-price */
-  skus?: Sku[];
-  isOfferPersonalized?: boolean;
-}): Promise<ProductPurchase> =>
+  appAccountToken,
+  skus, // Android Billing V5
+  isOfferPersonalized = undefined, // Android Billing V5
+  quantity,
+  withOffer,
+}: RequestPurchase): Promise<ProductPurchase> =>
   (
     Platform.select({
       ios: async () => {
@@ -263,7 +251,9 @@ export const requestPurchase = ({
         return getIosModule().buyProduct(
           sku,
           andDangerouslyFinishTransactionAutomaticallyIOS,
-          applicationUsername,
+          appAccountToken,
+          quantity ?? -1,
+          withOffer,
         );
       },
       android: async () => {
@@ -288,7 +278,7 @@ export const requestPurchase = ({
 /**
  * Request a purchase for product. This will be received in `PurchaseUpdatedListener`.
  * @param {string} [sku] The product's sku/ID
- * @param {string} [applicationUsername] The purchaser's user ID
+ * @param {string} [appAccountToken] The purchaser's user ID
  * @param {boolean} [andDangerouslyFinishTransactionAutomaticallyIOS] You should set this to false and call finishTransaction manually when you have delivered the purchased goods to the user. It defaults to true to provide backwards compatibility. Will default to false in version 4.0.0.
  * @param {string} [purchaseTokenAndroid] purchaseToken that the user is upgrading or downgrading from (Android).
  * @param {ProrationModesAndroid} [prorationModeAndroid] UNKNOWN_SUBSCRIPTION_UPGRADE_DOWNGRADE_POLICY, IMMEDIATE_WITH_TIME_PRORATION, IMMEDIATE_AND_CHARGE_PRORATED_PRICE, IMMEDIATE_WITHOUT_PRORATION, DEFERRED
@@ -300,26 +290,14 @@ export const requestPurchase = ({
 export const requestSubscription = ({
   sku,
   andDangerouslyFinishTransactionAutomaticallyIOS = false,
-  applicationUsername,
   purchaseTokenAndroid,
   prorationModeAndroid = -1,
-  subscriptionOffers,
   obfuscatedAccountIdAndroid,
   obfuscatedProfileIdAndroid,
-  isOfferPersonalized = undefined,
-}: {
-  sku?: Sku;
-  andDangerouslyFinishTransactionAutomaticallyIOS?: boolean;
-  applicationUsername?: string;
-  purchaseTokenAndroid?: string;
-  prorationModeAndroid?: ProrationModesAndroid;
-  /** For Google Play Billing Library 5 */
-  subscriptionOffers?: SubscriptionOffer[];
-  obfuscatedAccountIdAndroid?: string;
-  obfuscatedProfileIdAndroid?: string;
-  /** For Google Play Billing Library 5 https://developer.android.com/google/play/billing/integrate#personalized-price */
-  isOfferPersonalized?: boolean;
-}): Promise<SubscriptionPurchase | null> =>
+  subscriptionOffers = undefined, // Android Billing V5
+  isOfferPersonalized = undefined, // Android Billing V5
+  appAccountToken,
+}: RequestSubscription): Promise<SubscriptionPurchase | null> =>
   (
     Platform.select({
       ios: async () => {
@@ -332,7 +310,7 @@ export const requestSubscription = ({
         return getIosModule().buyProduct(
           sku,
           andDangerouslyFinishTransactionAutomaticallyIOS,
-          applicationUsername,
+          appAccountToken,
         );
       },
       android: async () => {
@@ -360,20 +338,6 @@ export const requestSubscription = ({
     }) || Promise.resolve
   )();
 
-/**
- * Request a purchase for product. This will be received in `PurchaseUpdatedListener`.
- * @param {string} sku The product's sku/ID
- * @returns {Promise<void>}
- */
-export const requestPurchaseWithQuantityIOS = ({
-  sku,
-  quantity,
-}: {
-  sku: Sku;
-  quantity: number;
-}): Promise<ProductPurchase> =>
-  getIosModule().buyProductWithQuantityIOS(sku, quantity);
-
 /**
  * Finish Transaction (both platforms)
  *   Abstracts  Finish Transaction
@@ -391,7 +355,7 @@ export const finishTransaction = ({
   isConsumable,
   developerPayloadAndroid,
 }: {
-  purchase: ProductPurchase | ProductPurchase;
+  purchase: ProductPurchase | SubscriptionPurchase;
   isConsumable?: boolean;
   developerPayloadAndroid?: string;
 }): Promise<string | void> => {
@@ -427,24 +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();
-
-/**
- * Clear valid Products (iOS only)
- *   Remove all products which are validated by Apple server.
- * @returns {void}
- */
-export const clearProductsIOS = (): Promise<void> =>
-  getIosModule().clearProducts();
-
 /**
  * Acknowledge a product (on Android.) No-op on iOS.
  * @param {string} token The product's token (on Android)
@@ -477,100 +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 requestAgnosticReceiptValidationIos = async (
-  receiptBody: Record<string, unknown>,
-): Promise<Apple.ReceiptValidationResponse | false> => {
-  const response = await enhancedFetch<Apple.ReceiptValidationResponse>(
-    'https://buy.itunes.apple.com/verifyReceipt',
-    {
-      method: 'POST',
-      body: 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;
-};
-
-/**
- * Buy products or subscriptions with offers (iOS only)
- *
- * Runs the payment process with some info you must fetch
- * from your server.
- * @param {string} sku The product identifier
- * @param {string} forUser  An user identifier on you system
- * @param {Apple.PaymentDiscount} withOffer The offer information
- * @param {string} withOffer.identifier The offer identifier
- * @param {string} withOffer.keyIdentifier Key identifier that it uses to generate the signature
- * @param {string} withOffer.nonce An UUID returned from the server
- * @param {string} withOffer.signature The actual signature returned from the server
- * @param {number} withOffer.timestamp The timestamp of the signature
- * @returns {Promise<void>}
- */
-export const requestPurchaseWithOfferIOS = ({
-  sku,
-  forUser,
-  withOffer,
-}: {
-  sku: Sku;
-  forUser: string;
-  withOffer: Apple.PaymentDiscount;
-}): Promise<void> =>
-  getIosModule().buyProductWithOffer(sku, forUser, withOffer);
-
-/**
- * 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.
@@ -632,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 ba1afe691..b19503fef 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -1,3 +1,4 @@
+import type * as Apple from './apple';
 export type Sku = string;
 
 export enum ProrationModesAndroid {
@@ -25,7 +26,6 @@ export enum InstallSourceAndroid {
 
 export interface ProductCommon {
   type: 'subs' | 'sub' | 'inapp' | 'iap';
-  productId: string;
   productIds?: string[];
   title: string;
   description: string;
@@ -88,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 {
@@ -124,7 +130,7 @@ export interface SubscriptionAndroid extends ProductCommon {
 
 export interface SubscriptionIOS extends ProductCommon {
   type: 'subs';
-
+  id: string;
   discounts?: Discount[];
   introductoryPrice?: string;
   introductoryPriceAsAmountIOS?: string;
@@ -146,6 +152,28 @@ export interface SubscriptionIOS extends ProductCommon {
 }
 
 export type Subscription = SubscriptionAndroid & SubscriptionIOS;
+export interface RequestPurchaseBaseAndroid {
+  obfuscatedAccountIdAndroid?: string;
+  obfuscatedProfileIdAndroid?: string;
+  isOfferPersonalized?: boolean; // For AndroidBilling V5 https://developer.android.com/google/play/billing/integrate#personalized-price
+}
+
+export interface RequestPurchaseAndroid extends RequestPurchaseBaseAndroid {
+  skus?: Sku[];
+}
+
+export interface RequestPurchaseIOS {
+  sku?: Sku;
+  andDangerouslyFinishTransactionAutomaticallyIOS?: boolean;
+  /**
+   * UUID representing user account
+   */
+  appAccountToken?: string;
+  quantity?: number;
+  withOffer?: Apple.PaymentDiscount;
+}
+
+export type RequestPurchase = RequestPurchaseAndroid & RequestPurchaseIOS;
 
 /**
  * In order to purchase a new subscription, every sku must have a selected offerToken
@@ -155,3 +183,14 @@ export interface SubscriptionOffer {
   sku: Sku;
   offerToken: string;
 }
+
+export interface RequestSubscriptionAndroid extends RequestPurchaseBaseAndroid {
+  purchaseTokenAndroid?: string;
+  prorationModeAndroid?: ProrationModesAndroid;
+  subscriptionOffers?: SubscriptionOffer[]; // For AndroidBilling V5
+}
+
+export type RequestSubscriptionIOS = RequestPurchaseIOS;
+
+export type RequestSubscription = RequestSubscriptionAndroid &
+  RequestSubscriptionIOS;