fix state checks

RevenueCat · Dec 11, 2024 · cc42021 · cc42021
1 parent ef78151
commit cc42021
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/RevenueCatUI/CustomerCenter/ViewModels/CustomerCenterViewModel.swift b/RevenueCatUI/CustomerCenter/ViewModels/CustomerCenterViewModel.swift
@@ -61,10 +61,6 @@ import RevenueCat
         }
     }
 
-    var isLoaded: Bool {
-        return state != .notLoaded && configuration != nil
-    }
-
     private let currentVersionFetcher: CurrentVersionFetcher
     internal let customerCenterActionHandler: CustomerCenterActionHandler?
 
@@ -97,8 +93,17 @@ import RevenueCat
 
     #endif
 
-    func loadPurchaseInformation() async {
+    func loadScreen() async {
         do {
+            try await self.loadPurchaseInformation()
+            try await self.loadCustomerCenterConfig()
+            self.state = .success
+        } catch {
+            self.state = .error(error)
+        }
+    }
+
+    func loadPurchaseInformation() async throws {
             let customerInfo = try await purchasesProvider.customerInfo()
             let hasActiveProducts =
             !customerInfo.activeSubscriptions.isEmpty || !customerInfo.nonSubscriptions.isEmpty
@@ -120,19 +125,10 @@ import RevenueCat
 
             self.purchaseInformation = try await createPurchaseInformation(for: activeTransaction,
                                                                            entitlement: entitlement)
-
-            self.state = .success
-        } catch {
-            self.state = .error(error)
-        }
     }
 
-    func loadCustomerCenterConfig() async {
-        do {
-            self.configuration = try await Purchases.shared.loadCustomerCenter()
-        } catch {
-            self.state = .error(error)
-        }
+    func loadCustomerCenterConfig() async throws {
+        self.configuration = try await Purchases.shared.loadCustomerCenter()
     }
 
     func performRestore() async -> RestorePurchasesAlert.AlertType {

diff --git a/RevenueCatUI/CustomerCenter/Views/CustomerCenterView.swift b/RevenueCatUI/CustomerCenter/Views/CustomerCenterView.swift
@@ -74,16 +74,18 @@ public struct CustomerCenterView: View {
             switch self.viewModel.state {
             case .error:
                 ErrorView()
-            case .loaded:
+            case .notLoaded:
+                TintedProgressView()
+            case .success:
                 if let configuration = self.viewModel.configuration {
                     destinationView(configuration: configuration)
                         .environment(\.localization, configuration.localization)
                         .environment(\.appearance, configuration.appearance)
                         .environment(\.supportInformation, configuration.support)
                         .environment(\.customerCenterPresentationMode, self.mode)
+                } else {
+                    TintedProgressView()
                 }
-            default:
-                TintedProgressView()
             }
         }
         .task {

diff --git a/RevenueCatUI/CustomerCenter/Views/ErrorView.swift b/RevenueCatUI/CustomerCenter/Views/ErrorView.swift
@@ -21,6 +21,9 @@ import SwiftUI
 @available(watchOS, unavailable)
 struct ErrorView: View {
 
+    @Environment(\.locale)
+    private var locale
+
     var body: some View {
         VStack(spacing: 20) {
             let errorMessage: String = Localization.localizedBundle(self.locale)