diff --git a/damus/ContentView.swift b/damus/ContentView.swift index 63416b55..0488587e 100644 --- a/damus/ContentView.swift +++ b/damus/ContentView.swift @@ -688,7 +688,7 @@ struct ContentView: View { home.damus_state = self.damus_state! - if let damus_state, damus_state.settings.enable_experimental_purple_api { + if let damus_state, damus_state.purple.enable_purple { // Assign delegate so that we can send receipts to the Purple API server as soon as we get updates from user's purchases StoreObserver.standard.delegate = damus_state.purple } diff --git a/damus/Models/Purple/DamusPurple.swift b/damus/Models/Purple/DamusPurple.swift index 1453c1ab..4bade34e 100644 --- a/damus/Models/Purple/DamusPurple.swift +++ b/damus/Models/Purple/DamusPurple.swift @@ -26,6 +26,11 @@ class DamusPurple: StoreObserverDelegate { var environment: DamusPurpleEnvironment { return self.settings.purple_enviroment } + + var enable_purple: Bool { + // TODO: On release, we could just replace this with `true` (or some other feature flag) + return self.settings.enable_experimental_purple_api + } func profile_purple_badge_info(pubkey: Pubkey) async -> UserBadgeInfo? { if let cached_result = self.starred_profiles_cache[pubkey] { diff --git a/damus/Views/Profile/EventProfileName.swift b/damus/Views/Profile/EventProfileName.swift index 6b61cc69..80f011ca 100644 --- a/damus/Views/Profile/EventProfileName.swift +++ b/damus/Views/Profile/EventProfileName.swift @@ -121,7 +121,7 @@ struct EventProfileName: View { } .onAppear(perform: { Task { - if damus_state.settings.enable_experimental_purple_api { + if damus_state.purple.enable_purple { self.purple_badge = await damus_state.purple.profile_purple_badge_info(pubkey: pubkey) } } diff --git a/damus/Views/Profile/ProfileName.swift b/damus/Views/Profile/ProfileName.swift index 5f4eb198..050a5e19 100644 --- a/damus/Views/Profile/ProfileName.swift +++ b/damus/Views/Profile/ProfileName.swift @@ -113,7 +113,7 @@ struct ProfileName: View { } .onAppear(perform: { Task { - if damus_state.settings.enable_experimental_purple_api { + if damus_state.purple.enable_purple { self.purple_badge = await damus_state.purple.profile_purple_badge_info(pubkey: pubkey) } } diff --git a/damus/Views/Settings/TranslationSettingsView.swift b/damus/Views/Settings/TranslationSettingsView.swift index b2733294..e2eedc00 100644 --- a/damus/Views/Settings/TranslationSettingsView.swift +++ b/damus/Views/Settings/TranslationSettingsView.swift @@ -20,13 +20,13 @@ struct TranslationSettingsView: View { .toggleStyle(.switch) Picker(NSLocalizedString("Service", comment: "Prompt selection of translation service provider."), selection: $settings.translation_service) { - ForEach(TranslationService.allCases.filter({ settings.enable_experimental_purple_api ? true : $0 != .purple }), id: \.self) { server in + ForEach(TranslationService.allCases.filter({ damus_state.purple.enable_purple ? true : $0 != .purple }), id: \.self) { server in Text(server.model.displayName) .tag(server.model.tag) } } - if settings.translation_service == .purple && settings.enable_experimental_purple_api { + if settings.translation_service == .purple && damus_state.purple.enable_purple { NavigationLink(destination: DamusPurpleView(damus_state: damus_state)) { Text(NSLocalizedString("Configure Damus Purple", comment: "Button to allow Damus Purple to be configured")) } diff --git a/damus/Views/SideMenuView.swift b/damus/Views/SideMenuView.swift index ea5895ec..63e54591 100644 --- a/damus/Views/SideMenuView.swift +++ b/damus/Views/SideMenuView.swift @@ -54,7 +54,7 @@ struct SideMenuView: View { navLabel(title: NSLocalizedString("Wallet", comment: "Sidebar menu label for Wallet view."), img: "wallet") } - if damus_state.settings.enable_experimental_purple_api { + if damus_state.purple.enable_purple { NavigationLink(destination: DamusPurpleView(damus_state: damus_state)) { HStack(spacing: 13) { Image("nostr-hashtag")