Properly reflect state + default to staging in alpha/debug

duckduckgo · Apr 23, 2024 · d7dab93 · d7dab93
1 parent 10c7aab
commit d7dab93
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/DuckDuckGo/AppDelegate.swift b/DuckDuckGo/AppDelegate.swift
@@ -431,8 +431,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     private func setupSubscriptionsEnvironment() {
         Task {
-            let environment = SubscriptionPurchaseEnvironment.ServiceEnvironment(rawValue: privacyProEnvironment) ??
-                SubscriptionPurchaseEnvironment.ServiceEnvironment.default
+            #if ALPHA || DEBUG
+                let defaultEnvironment = SubscriptionPurchaseEnvironment.ServiceEnvironment.staging
+            #else
+                let defaultEnvironment = SubscriptionPurchaseEnvironment.ServiceEnvironment.production
+            #endif
+            let environment = SubscriptionPurchaseEnvironment.ServiceEnvironment(rawValue: privacyProEnvironment) ?? defaultEnvironment
             SubscriptionPurchaseEnvironment.currentServiceEnvironment = environment
             VPNSettings(defaults: .networkProtectionGroupDefaults).selectedEnvironment = (environment == .production) ? .production : .staging
             SubscriptionPurchaseEnvironment.current = .appStore

diff --git a/DuckDuckGo/SubscriptionDebugViewController.swift b/DuckDuckGo/SubscriptionDebugViewController.swift
@@ -125,15 +125,15 @@ final class SubscriptionDebugViewController: UITableViewController {
             }
 
         case .environment:
-            let staging = SubscriptionPurchaseEnvironment.ServiceEnvironment.staging.rawValue
-            let prod = SubscriptionPurchaseEnvironment.ServiceEnvironment.production.rawValue
+            let staging = SubscriptionPurchaseEnvironment.ServiceEnvironment.staging
+            let prod = SubscriptionPurchaseEnvironment.ServiceEnvironment.production
             switch EnvironmentRows(rawValue: indexPath.row) {
             case .staging:
                 cell.textLabel?.text = "Staging"
-                cell.accessoryType = privacyProEnvironment == staging ? .checkmark : .none
+                cell.accessoryType = SubscriptionPurchaseEnvironment.currentServiceEnvironment == staging ? .checkmark : .none
             case .production:
                 cell.textLabel?.text = "Production"
-                cell.accessoryType = privacyProEnvironment == prod ? .checkmark : .none
+                cell.accessoryType = SubscriptionPurchaseEnvironment.currentServiceEnvironment == prod ? .checkmark : .none
             case .none:
                 break
             }