Calling VPN churn billing and mixing it with StoreKit functionality

brave · Sep 25, 2023 · b8c2b13 · b8c2b13
1 parent ce4d728
commit b8c2b13
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/Sources/Brave/Frontend/Browser/BrowserViewController.swift b/Sources/Brave/Frontend/Browser/BrowserViewController.swift
@@ -1101,12 +1101,8 @@ public class BrowserViewController: UIViewController {
     }
   }
 
-  private func checkCrashRestorationOrSetupTabs() {
-    if crashedLastSession {
-      showRestoreTabsAlert()
-    } else {
-      setupTabs()
-    }
+  private func checkCrashRestorationOrSetupTabs() { 
+    setupTabs()
   }
 
   fileprivate func showRestoreTabsAlert() {

diff --git a/Sources/Brave/Frontend/Browser/BrowserViewController/BrowserViewController+Callout.swift b/Sources/Brave/Frontend/Browser/BrowserViewController/BrowserViewController+Callout.swift
@@ -12,6 +12,7 @@ import SwiftUI
 import BraveVPN
 import Onboarding
 import SafariServices
+import StoreKit
 
 // MARK: - Callouts
 
@@ -264,9 +265,27 @@ extension BrowserViewController {
         return
       }
     }
+
 
 #if compiler(>=5.8)
-    if #available(iOS 16.4, *) {
+      if #available(iOS 16.4, *) {
+        Task { @MainActor in
+          for await message in StoreKit.Message.messages {
+            guard let windowScene = currentScene else {
+              return
+            }
+
+            try? message.display(in: windowScene)
+          }
+        }
+      } else {
+        presentVPNChurnBilling()
+      }
+#else
+    presentVPNChurnBilling()
+#endif
+
+    func presentVPNChurnBilling() {
       presentVPNChurnPromoCallout(for: .updateBillingExpired) {
         // Opens Apple's 'manage subscription' screen
         guard let url = URL.apple.manageSubscriptions else { return }
@@ -276,7 +295,6 @@ extension BrowserViewController {
         }
       }
     }
-#endif
   }
 
   // MARK: Helper Methods for Presentation