Refactored PurchaseHandler

RevenueCat · Sep 11, 2023 · 6074fa8 · 6074fa8
1 parent 0a23c19
commit 6074fa8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/RevenueCatUI/PaywallView.swift b/RevenueCatUI/PaywallView.swift
@@ -237,7 +237,7 @@ struct LoadedOfferingPaywallView: View {
                         value: self.purchaseHandler.purchasedCustomerInfo)
             .disabled(self.purchaseHandler.actionInProgress)
             .onAppear { self.purchaseHandler.trackPaywallView(self.eventData) }
-            .onDisappear { self.purchaseHandler.trackPaywallClose() }
+            .onDisappear { self.purchaseHandler.trackPaywallClose(self.eventData) }
 
         switch self.mode {
         case .fullScreen:

diff --git a/RevenueCatUI/Purchasing/PurchaseHandler.swift b/RevenueCatUI/Purchasing/PurchaseHandler.swift
@@ -108,15 +108,20 @@ extension PurchaseHandler {
 
     func trackPaywallView(_ eventData: PaywallEvent.Data) {
         self.eventData = eventData
-        self.trackEvent(PaywallEvent.view)
+        self.track(.view(eventData))
     }
 
-    func trackPaywallClose() {
-        self.trackEvent(PaywallEvent.close)
+    func trackPaywallClose(_ eventData: PaywallEvent.Data) {
+        self.track(.close(eventData))
     }
 
     fileprivate func trackCancelledPurchase() {
-        self.trackEvent(PaywallEvent.cancel)
+        guard let data = self.eventData else {
+            Logger.warning(Strings.attempted_to_track_event_with_missing_data)
+            return
+        }
+
+        self.track(.cancel(data))
     }
 
 }
@@ -151,14 +156,7 @@ extension PurchaseHandler {
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, *)
 private extension PurchaseHandler {
 
-    func trackEvent(_ eventCreator: (PaywallEvent.Data) -> PaywallEvent) {
-        guard let data = self.eventData else {
-            Logger.warning(Strings.attempted_to_track_event_with_missing_data)
-            return
-        }
-
-        let event = eventCreator(data)
-
+    func track(_ event: PaywallEvent) {
         Task.detached(priority: .background) { [block = self.trackEventBlock] in
             await block(event)
         }