Fix trial notification

oversizedev · Jul 3, 2023 · 9f6f6a2 · 9f6f6a2
1 parent 1c984fe
commit 9f6f6a2
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 17 deletions.
diff --git a/Sources/OversizeKit/StoreKit/StoreScreen/ViewModel/StoreViewModel.swift b/Sources/OversizeKit/StoreKit/StoreScreen/ViewModel/StoreViewModel.swift
@@ -276,7 +276,7 @@ extension StoreViewModel {
         }
     }
 
-    func buy(product: Product, trialNotification: Bool = false) async -> Bool {
+    func buy(product: Product) async -> Bool {
         isBuyLoading = true
         do {
             let result = try await storeKitService.purchase(product)
@@ -285,21 +285,6 @@ extension StoreViewModel {
                 isPremium = true
                 isPremiumActivated = true
                 isBuyLoading = false
-                if trialNotification, product.type == .autoRenewable, product.subscription?.introductoryOffer != nil {
-                    let result = await localNotificationService.requestAccess()
-                    if case let .success(status) = result, status, let trialDaysCount = product.trialDaysCount {
-                        let timeInterval = TimeInterval((trialDaysCount - 2) * 24 * 60 * 60)
-                        let notificationTime = Date().addingTimeInterval(timeInterval)
-                        let dateComponents = Calendar.current.dateComponents([.year, .month, .day, .hour, .minute], from: notificationTime)
-                        await localNotificationService.schedule(localNotification: .init(
-                            id: UUID(),
-                            title: "Trial ends soon",
-                            body: "Subscription ends in 2 days",
-                            dateComponents: dateComponents,
-                            repeats: false
-                        ))
-                    }
-                }
                 return true
             case .failure:
                 isBuyLoading = false
@@ -315,6 +300,24 @@ extension StoreViewModel {
             return false
         }
     }
+
+    func addTrialNotification(product: Product) async {
+        if product.type == .autoRenewable, product.subscription?.introductoryOffer != nil {
+            let result = await localNotificationService.requestAccess()
+            if case let .success(status) = result, status, let trialDaysCount = product.trialDaysCount {
+                let timeInterval = TimeInterval((trialDaysCount - 2) * 24 * 60 * 60)
+                let notificationTime = Date().addingTimeInterval(timeInterval)
+                let dateComponents = Calendar.current.dateComponents([.year, .month, .day, .hour, .minute], from: notificationTime)
+                await localNotificationService.schedule(localNotification: .init(
+                    id: UUID(),
+                    title: "Trial ends soon",
+                    body: "Subscription ends in 2 days",
+                    dateComponents: dateComponents,
+                    repeats: false
+                ))
+            }
+        }
+    }
 }
 
 extension StoreViewModel {

diff --git a/Sources/OversizeKit/StoreKit/Views/StorePaymentButtonBar.swift b/Sources/OversizeKit/StoreKit/Views/StorePaymentButtonBar.swift
@@ -26,7 +26,10 @@ struct StorePaymentButtonBar: View {
             Button {
                 if let selectedProduct = viewModel.selectedProduct {
                     Task {
-                        await viewModel.buy(product: selectedProduct, trialNotification: trialNotification)
+                        let status = await viewModel.buy(product: selectedProduct)
+                        if trialNotification, status {
+                            await viewModel.addTrialNotification(product: selectedProduct)
+                        }
                     }
                 }
             } label: {