From 9fd2f51871f6995ce6d058c08004627c14de7bc6 Mon Sep 17 00:00:00 2001
From: Stephen B <158498287+StephenDev0@users.noreply.github.com>
Date: Wed, 24 Sep 2025 16:09:26 -0400
Subject: [PATCH] Final fixes

---
 .../xcshareddata/xcschemes/StikDebug.xcscheme |  2 +-
 StikJIT/Utilities/ThemeExpansionManager.swift | 57 ++++++++++++++++---
 StikJIT/Views/DisplayView.swift               |  2 +-
 3 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/StikDebug.xcodeproj/xcshareddata/xcschemes/StikDebug.xcscheme b/StikDebug.xcodeproj/xcshareddata/xcschemes/StikDebug.xcscheme
index 006d471..0b70022 100644
--- a/StikDebug.xcodeproj/xcshareddata/xcschemes/StikDebug.xcscheme
+++ b/StikDebug.xcodeproj/xcshareddata/xcschemes/StikDebug.xcscheme
@@ -55,7 +55,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
diff --git a/StikJIT/Utilities/ThemeExpansionManager.swift b/StikJIT/Utilities/ThemeExpansionManager.swift
index 3229f92..6350485 100644
--- a/StikJIT/Utilities/ThemeExpansionManager.swift
+++ b/StikJIT/Utilities/ThemeExpansionManager.swift
@@ -93,9 +93,11 @@ final class ThemeExpansionManager: ObservableObject {
 
         guard !previewUnlocked else { return }
 
-        updatesTask = Task.detached(priority: .background) { [weak self] in
+        // Listen for transaction updates and apply verified ones
+        updatesTask = Task { [weak self] in
+            guard let self else { return }
             for await result in StoreKit.Transaction.updates {
-                await self?.handle(transactionResult: result)
+                await self.handle(transactionResult: result)
             }
         }
 
@@ -115,11 +117,33 @@ final class ThemeExpansionManager: ObservableObject {
             let products = try await Product.products(for: [Self.productIdentifier])
             themeExpansionProduct = products.first
 
-            if let latest = await StoreKit.Transaction.latest(for: Self.productIdentifier) {
-                await handle(transactionResult: latest, finishTransaction: false)
-            } else {
-                hasThemeExpansion = false
+            if products.isEmpty {
+                #if targetEnvironment(simulator)
+                lastError = """
+                No products found for.
+                """
+                #else
+                lastError = """
+                No products found for.
+                """
+                #endif
             }
+
+            // Recompute entitlement from current entitlements
+            hasThemeExpansion = await isEntitledToThemeExpansion()
+        } catch {
+            lastError = error.localizedDescription
+        }
+    }
+
+    func restorePurchases() async {
+        guard !isPreviewInstance else { return }
+        isProcessing = true
+        defer { isProcessing = false }
+        do {
+            lastError = nil
+            try await AppStore.sync()
+            hasThemeExpansion = await isEntitledToThemeExpansion()
         } catch {
             lastError = error.localizedDescription
         }
@@ -138,7 +162,15 @@ final class ThemeExpansionManager: ObservableObject {
                     themeExpansionProduct = first
                     product = first
                 } else {
-                    lastError = "Theme Expansion isn't available yet. Check your App Store configuration and try again."
+                    #if targetEnvironment(simulator)
+                    lastError = """
+                    Theme Expansion isn’t available.
+                    """
+                    #else
+                    lastError = """
+                    Theme Expansion isn’t available.
+                    """
+                    #endif
                     return
                 }
             } catch {
@@ -278,7 +310,7 @@ final class ThemeExpansionManager: ObservableObject {
         switch transactionResult {
         case .verified(let transaction):
             if transaction.productID == Self.productIdentifier {
-                hasThemeExpansion = true
+                hasThemeExpansion = (transaction.revocationDate == nil)
                 lastError = nil
             }
             if finishTransaction {
@@ -288,6 +320,15 @@ final class ThemeExpansionManager: ObservableObject {
             lastError = error.localizedDescription
         }
     }
+
+    private func isEntitledToThemeExpansion() async -> Bool {
+        for await result in Transaction.currentEntitlements {
+            if case .verified(let transaction) = result, transaction.productID == Self.productIdentifier {
+                return transaction.revocationDate == nil
+            }
+        }
+        return false
+    }
 }
 
 #if DEBUG
diff --git a/StikJIT/Views/DisplayView.swift b/StikJIT/Views/DisplayView.swift
index 6660ad7..882e6f6 100644
--- a/StikJIT/Views/DisplayView.swift
+++ b/StikJIT/Views/DisplayView.swift
@@ -375,7 +375,7 @@ struct DisplayView: View {
 
             if let manager = themeExpansion {
                 Button {
-                    Task { await manager.refreshEntitlements() }
+                    Task { await manager.restorePurchases() }
                 } label: {
                     Text("Restore Purchase")
                         .font(.subheadline)