Paywalls: only dismiss PaywallView when explicitly presenting it …

…with `.presentPaywallIfNeeded` (#3075)
RevenueCat · Sep 14, 2023 · 811c91c · 811c91c
1 parent 2dae7fd
commit 811c91c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/RevenueCatUI/View+PresentPaywall.swift b/RevenueCatUI/View+PresentPaywall.swift
@@ -129,6 +129,8 @@ private struct PresentingPaywallModifier: ViewModifier {
                     )
                     .onPurchaseCompleted {
                         self.purchaseCompleted?($0)
+
+                        self.isDisplayed = false
                     }
                     .toolbar {
                         ToolbarItem(placement: .destructiveAction) {

diff --git a/RevenueCatUI/Views/PurchaseButton.swift b/RevenueCatUI/Views/PurchaseButton.swift
@@ -53,9 +53,6 @@ struct PurchaseButton: View {
         self.purchaseHandler = purchaseHandler
     }
 
-    @Environment(\.dismiss)
-    private var dismiss
-
     var body: some View {
         self.button
     }
@@ -64,12 +61,8 @@ struct PurchaseButton: View {
         AsyncButton {
             guard !self.purchaseHandler.actionInProgress else { return }
 
-            let cancelled = try await self.purchaseHandler.purchase(package: self.package.content,
-                                                                    with: self.mode).userCancelled
-
-            if !cancelled, case .fullScreen = self.mode {
-                self.dismiss()
-            }
+            _ = try await self.purchaseHandler.purchase(package: self.package.content,
+                                                        with: self.mode)
         } label: {
             IntroEligibilityStateView(
                 textWithNoIntroOffer: self.package.localization.callToAction,

diff --git a/Tests/TestingApps/SimpleApp/SimpleApp/Views/SamplePaywallsList.swift b/Tests/TestingApps/SimpleApp/SimpleApp/Views/SamplePaywallsList.swift
@@ -57,6 +57,9 @@ struct SamplePaywallsList: View {
                                 purchaseHandler: .default())
                 }
             }
+            .onPurchaseCompleted { _ in
+                self.display = nil
+            }
             .navigationTitle("Paywalls")
     }