Merge pull request #89 from AppSci/release/2.0.5

Release: 2.0.5
AppSci · Oct 25, 2023 · 9bad98d · 9bad98d
2 parents b31a56c + 4ae3e7b
commit 9bad98d
Showing 1 changed file with 20 additions and 15 deletions.
diff --git a/Sources/PandaSDK/Views/WebViewController.swift b/Sources/PandaSDK/Views/WebViewController.swift
@@ -618,34 +618,25 @@ extension WebViewController {
         }
     }
 
-    func sendLocalizedPrices(products: [Product]) {
-        let localizedPricesToSend = products.map { product -> [String : Any] in
+    func sendLocalizedPrices(products: [Product]) async {
+        var localizedPricesToSend: [[String: Any]] = []
+        for product in products {
             var localizedPriceInfo = [String: Any]()
-            var price: Decimal
-            if let introductoryOffer = product.subscription?.introductoryOffer {
-                switch introductoryOffer.paymentMode {
-                case .payAsYouGo, .payUpFront:
-                    price = introductoryOffer.price
-                default:
-                    price = product.price
-                }
-            } else {
-                price = product.price
-            }
+            var price = await productPrice(for: product)
             var roundedValue = Decimal()
             NSDecimalRound(&roundedValue, &price, 2, .bankers)
             let micros = roundedValue * Decimal(1_000_000)
             localizedPriceInfo["productId"] = product.id
             localizedPriceInfo["priceAmountMicros"] =  micros
             localizedPriceInfo["priceCurrencyCode"] = product.priceFormatStyle.currencyCode
-            return localizedPriceInfo
+            localizedPricesToSend.append(localizedPriceInfo)
         }
 
         let localizedPricesToSendJSON = localizedPricesToSend.toJSONString()
         let jsFunction = "pricingLoaded(\(localizedPricesToSendJSON))"
 
         DispatchQueue.main.async {
-            self.wv.evaluateJavaScript(jsFunction) { (result, error) in
+            self.wv.evaluateJavaScript(jsFunction) { result, error in
                 if let error = error {
                     pandaLog("\(error)")
                 }
@@ -655,6 +646,20 @@ extension WebViewController {
             }
         }
     }
+
+    private func productPrice(for product: Product) async -> Decimal {
+        let subscription = product.subscription
+        if let subscription, await subscription.isEligibleForIntroOffer, let introductoryOffer = subscription.introductoryOffer {
+            switch introductoryOffer.paymentMode {
+            case .payAsYouGo, .payUpFront:
+                return introductoryOffer.price
+            default:
+                return product.price
+            }
+        } else {
+            return product.price
+        }
+    }
 }
 
 extension WebViewController {